diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
index 4b7960d50e..3ed8ae2011 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
@@ -38,7 +38,9 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
     Log.i(TAG, "onCreate(" + savedInstanceState + ")");
     onPreCreate();
 
-    final boolean locked = KeyCachingService.isLocked(this);
+    final boolean locked = KeyCachingService.isLocked(this) &&
+            TextSecurePreferences.isScreenLockEnabled(this) &&
+            TextSecurePreferences.getLocalNumber(this) != null;
     routeApplicationState(locked);
 
     super.onCreate(savedInstanceState);