diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupSendJobHelper.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupSendJobHelper.java
index 2c83338fee..c21717df38 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupSendJobHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupSendJobHelper.java
@@ -43,10 +43,16 @@ final class GroupSendJobHelper {
         skipped.add(recipient.getId());
       }
 
-      if (sendMessageResult.getSuccess()               != null ||
-          sendMessageResult.getIdentityFailure()       != null ||
-          sendMessageResult.getProofRequiredFailure()  != null ||
-          sendMessageResult.isUnregisteredFailure())
+      if (sendMessageResult.isInvalidPreKeyFailure()) {
+        Log.w(TAG, "Invalid pre-key failure for " + recipient.getId());
+        skipped.add(recipient.getId());
+      }
+
+      if (sendMessageResult.getSuccess() != null ||
+          sendMessageResult.getIdentityFailure() != null ||
+          sendMessageResult.getProofRequiredFailure() != null ||
+          sendMessageResult.isUnregisteredFailure() ||
+          sendMessageResult.isInvalidPreKeyFailure())
       {
         completions.add(recipient);
       }