diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
index 3a923078e..671472c36 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
@@ -313,6 +313,11 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
           builder.setRelay(message.getRelay());
         }
 
+        // TODO Destination UUIDs will be present for all messages after 2021-12-16
+        if (message.getDestinationUuid() != null) {
+          builder.setDestinationUuid(message.getDestinationUuid().toString());
+        }
+
         builder.setServerGuid(message.getGuid().toString());
 
         final Envelope envelope = builder.build();