diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
index bf96e51ec4..4b3afcdee7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
@@ -71,8 +71,10 @@ public class SmsReceiveJob extends BaseJob {
 
   @Override
   public void onRun() throws MigrationPendingException {
-    Log.i(TAG, "onRun()");
-    
+    if (TextSecurePreferences.getLocalUuid(context) == null && TextSecurePreferences.getLocalNumber(context) == null) {
+      throw new NotReadyException();
+    }
+
     Optional<IncomingTextMessage> message = assembleMessageFragments(pdus, subscriptionId);
 
     if (message.isPresent() && !isBlocked(message.get())) {
@@ -167,4 +169,7 @@ public class SmsReceiveJob extends BaseJob {
       }
     }
   }
+
+  private class NotReadyException extends RuntimeException {
+  }
 }