diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m
index 5d57b862b..4e0ec2275 100644
--- a/SignalServiceKit/src/Messages/OWSMessageSender.m
+++ b/SignalServiceKit/src/Messages/OWSMessageSender.m
@@ -501,6 +501,12 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
                 }];
             }
 
+            if (sendingRecipientIds.count < 1) {
+                // All recipients are already sent or can be skipped.
+                successHandler();
+                return;
+            }
+
             NSError *error;
             NSArray<SignalRecipient *> *recipients =
                 [self getRecipientsForRecipientIds:sendingRecipientIds.allObjects error:&error];