diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m
index 280247da1..3fe962a67 100644
--- a/SignalServiceKit/src/Messages/OWSMessageSender.m
+++ b/SignalServiceKit/src/Messages/OWSMessageSender.m
@@ -987,15 +987,15 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
         deviceMessages = @{};
     } else {
         deviceMessages = [self deviceMessagesForMessageSend:messageSend error:&deviceMessagesError];
+        
+        // Loki: Remove this when we have shared sender keys
+        // ========
+        if (deviceMessages.count == 0) {
+            return messageSend.success();
+        }
+        // ========
     }
 
-    // Loki: Remove this when we have shared sender keys
-    // ========
-    if (deviceMessages.count == 0) {
-        return messageSend.success();
-    }
-    // ========
-
     if (deviceMessagesError || !deviceMessages) {
         OWSAssertDebug(deviceMessagesError);
         return messageSend.failure(deviceMessagesError);