diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index 50c295310..8eba401ef 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -500,8 +500,11 @@ NS_ASSUME_NONNULL_BEGIN
         }
     }
 
-    // Send delivery receipts for "valid data" messages.
-    [self.deliveryReceiptManager envelopeWasReceived:envelope];
+    // Send delivery receipts for "valid data" messages received via UD.
+    BOOL wasReceivedByUD = envelope.type == SSKProtoEnvelopeTypeUnidentifiedSender;
+    if (wasReceivedByUD) {
+        [self.deliveryReceiptManager envelopeWasReceived:envelope];
+    }
 }
 
 - (void)sendDeliveryReceiptForEnvelope:(SSKProtoEnvelope *)envelope {