diff --git a/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java b/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java
index 966c2f5739..9b8852fe4a 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java
@@ -31,8 +31,13 @@ public abstract class PushReceivedJob extends ContextJob {
       directory.setNumber(contactTokenDetails, true);
     }
 
-    if (envelope.isReceipt()) handleReceipt(envelope);
-    else                      handleMessage(envelope, sendExplicitReceipt);
+    if (envelope.isReceipt()) {
+      handleReceipt(envelope);
+    } else if (envelope.isPreKeyWhisperMessage() || envelope.isWhisperMessage()) {
+      handleMessage(envelope, sendExplicitReceipt);
+    } else {
+      Log.w(TAG, "Received envelope of unknown type: " + envelope.getType());
+    }
   }
 
   private void handleMessage(TextSecureEnvelope envelope, boolean sendExplicitReceipt) {