diff --git a/src/org/thoughtcrime/securesms/RoutingActivity.java b/src/org/thoughtcrime/securesms/RoutingActivity.java
index fcccd35e59..b4001e1133 100644
--- a/src/org/thoughtcrime/securesms/RoutingActivity.java
+++ b/src/org/thoughtcrime/securesms/RoutingActivity.java
@@ -127,7 +127,9 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
     else if (parameters.recipients != null) intent = getConversationIntent(parameters);
     else                                    intent = getConversationListIntent();
 
-    if (!TextSecurePreferences.isSignedPreKeyRegistered(this)) {
+    if (TextSecurePreferences.isPushRegistered(this) &&
+        !TextSecurePreferences.isSignedPreKeyRegistered(this))
+    {
       PreKeyService.initiateCreateSigned(this, masterSecret);
     }