diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDb.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDb.java
index fb18b8092..67af5abaa 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDb.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDb.java
@@ -88,10 +88,7 @@ public class MessagesDynamoDb extends AbstractDynamoDbStore {
           .put(KEY_TIMESTAMP, AttributeValues.fromLong(message.getTimestamp()))
           .put(KEY_TTL, AttributeValues.fromLong(getTtlForMessage(message)));
 
-      // TODO All messages should have a destination UUID by 2021-12-03, and this can be set unconditionally
-      if (message.hasDestinationUuid()) {
-        item.put(KEY_DESTINATION_UUID, AttributeValues.fromUUID(UUID.fromString(message.getDestinationUuid())));
-      }
+      item.put(KEY_DESTINATION_UUID, AttributeValues.fromUUID(UUID.fromString(message.getDestinationUuid())));
 
       if (message.hasRelay() && message.getRelay().length() > 0) {
         item.put(KEY_RELAY, AttributeValues.fromString(message.getRelay()));