diff --git a/src/Messages/OWSMessageSender.m b/src/Messages/OWSMessageSender.m
index b2dd1491d..358fc6a75 100644
--- a/src/Messages/OWSMessageSender.m
+++ b/src/Messages/OWSMessageSender.m
@@ -1089,10 +1089,16 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
 - (void)handleMessageSentLocally:(TSOutgoingMessage *)message
 {
     if (message.shouldSyncTranscript) {
-        // TODO: I suspect we shouldn't optimistically set hasSyncedTranscript.
-        //       We could set this in a success handler for [sendSyncTranscriptForMessage:].
-        [message updateWithHasSyncedTranscript:YES];
-        [self sendSyncTranscriptForMessage:message];
+        __block BOOL hasSecondaryDevices = NO;
+        [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
+            hasSecondaryDevices = [OWSDevice hasSecondaryDevicesWithTransaction:transaction];
+        }];
+        if (hasSecondaryDevices) {
+            // TODO: I suspect we shouldn't optimistically set hasSyncedTranscript.
+            //       We could set this in a success handler for [sendSyncTranscriptForMessage:].
+            [message updateWithHasSyncedTranscript:YES];
+            [self sendSyncTranscriptForMessage:message];
+        }
     }
 
     [OWSDisappearingMessagesJob setExpirationForMessage:message];