diff --git a/src/transport/omikron_connection.rs b/src/transport/omikron_connection.rs
index 69d9691..d0f7280 100644
--- a/src/transport/omikron_connection.rs
+++ b/src/transport/omikron_connection.rs
@@ -504,7 +504,9 @@ impl OmikronConnection {
                 let response = self
                     .clone()
                     .build_user_data_response(cv.get_id(), user_data)
-                    .await;
+                    .await
+                    .with_receiver(cv.get_sender())
+                    .with_sender(cv.get_receiver());
                 return self.send(&response).await;
             }
         }
@@ -515,14 +517,18 @@ impl OmikronConnection {
                 let response = self
                     .clone()
                     .build_user_data_response(cv.get_id(), user_data)
-                    .await;
+                    .await
+                    .with_receiver(cv.get_sender())
+                    .with_sender(cv.get_receiver());
                 return self.send(&response).await;
             }
         }
 
         // Not found
-        let response =
-            CommunicationValue::new(CommunicationType::error_not_found).with_id(cv.get_id());
+        let response = CommunicationValue::new(CommunicationType::error_not_found)
+            .with_id(cv.get_id())
+            .with_receiver(cv.get_sender())
+            .with_sender(cv.get_receiver());
         self.send(&response).await
     }