diff --git a/ts/jobs/helpers/sendNormalMessage.ts b/ts/jobs/helpers/sendNormalMessage.ts
index 5233c7f17..f6d68cdcf 100644
--- a/ts/jobs/helpers/sendNormalMessage.ts
+++ b/ts/jobs/helpers/sendNormalMessage.ts
@@ -1226,6 +1226,10 @@ function didSendToEveryone({
       prop: 'sendStateByConversationId',
       targetTimestamp,
     }) || {};
+  const ourConversationId =
+    window.ConversationController.getOurConversationIdOrThrow();
+  const areWePrimaryDevice = window.ConversationController.areWePrimaryDevice();
+
   return Object.entries(sendStateByConversationId).every(
     ([conversationId, sendState]) => {
       const conversation = window.ConversationController.get(conversationId);
@@ -1238,6 +1242,10 @@ function didSendToEveryone({
         }
       }
 
+      if (conversationId === ourConversationId && areWePrimaryDevice) {
+        return true;
+      }
+
       return isSent(sendState.status);
     }
   );