diff --git a/crates/core/database/src/models/users/model.rs b/crates/core/database/src/models/users/model.rs
index 9ca98eb5..a52afbab 100644
--- a/crates/core/database/src/models/users/model.rs
+++ b/crates/core/database/src/models/users/model.rs
@@ -542,7 +542,7 @@ impl User {
     pub async fn add_friend(
         &mut self,
         db: &Database,
-        amqp: Option<&AMQP>,
+        amqp: &AMQP,
         target: &mut User,
     ) -> Result<()> {
         match self.relationship_with(&target.id) {
@@ -552,10 +552,8 @@ impl User {
             RelationshipStatus::Blocked => Err(create_error!(Blocked)),
             RelationshipStatus::BlockedOther => Err(create_error!(BlockedByOther)),
             RelationshipStatus::Incoming => {
-                if let Some(amqp) = amqp {
-                    // Accept incoming friend request
-                    _ = amqp.friend_request_accepted(self, target).await;
-                };
+                // Accept incoming friend request
+                _ = amqp.friend_request_accepted(self, target).await;
 
                 self.apply_relationship(
                     db,
@@ -585,9 +583,7 @@ impl User {
                     }));
                 }
 
-                if let Some(amqp) = amqp {
-                    _ = amqp.friend_request_received(target, self).await;
-                };
+                _ = amqp.friend_request_received(target, self).await;
 
                 // Send the friend request
                 self.apply_relationship(
diff --git a/crates/daemons/voice-ingress/src/api.rs b/crates/daemons/voice-ingress/src/api.rs
index 7010c58e..adc6599e 100644
--- a/crates/daemons/voice-ingress/src/api.rs
+++ b/crates/daemons/voice-ingress/src/api.rs
@@ -255,6 +255,7 @@ pub async fn ingress(
                             message
                                 .update(
                                     db,
+                                    Some(amqp),
                                     PartialMessage {
                                         system: message.system.clone(),
                                         ..Default::default()
diff --git a/crates/delta/src/routes/users/add_friend.rs b/crates/delta/src/routes/users/add_friend.rs
index 59e1c2fb..946c3296 100644
--- a/crates/delta/src/routes/users/add_friend.rs
+++ b/crates/delta/src/routes/users/add_friend.rs
@@ -22,6 +22,6 @@ pub async fn add(
         return Err(create_error!(IsBot));
     }
 
-    user.add_friend(db, Some(amqp), &mut target).await?;
+    user.add_friend(db, amqp, &mut target).await?;
     Ok(Json(target.into(db, &user).await))
 }
diff --git a/crates/delta/src/routes/users/send_friend_request.rs b/crates/delta/src/routes/users/send_friend_request.rs
index 421e4ed8..a87334af 100644
--- a/crates/delta/src/routes/users/send_friend_request.rs
+++ b/crates/delta/src/routes/users/send_friend_request.rs
@@ -23,7 +23,7 @@ pub async fn send_friend_request(
             return Err(create_error!(IsBot));
         }
 
-        user.add_friend(db, Some(amqp), &mut target).await?;
+        user.add_friend(db, amqp, &mut target).await?;
         Ok(Json(target.into(db, &user).await))
     } else {
         Err(create_error!(InvalidProperty))