diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/RestStrategy.java b/app/src/main/java/org/thoughtcrime/securesms/messages/RestStrategy.java
index 36a452500..772dc7ac7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/RestStrategy.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/RestStrategy.java
@@ -10,6 +10,7 @@ import org.thoughtcrime.securesms.jobmanager.JobTracker;
 import org.thoughtcrime.securesms.jobs.MarkerJob;
 import org.thoughtcrime.securesms.jobs.PushDecryptMessageJob;
 import org.thoughtcrime.securesms.jobs.PushProcessMessageJob;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.stories.Stories;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
@@ -71,7 +72,7 @@ public class RestStrategy extends MessageRetrievalStrategy {
     } catch (IOException e) {
       Log.w(TAG, "Failed to retrieve messages. Resetting the SignalServiceMessageReceiver.", e);
       ApplicationDependencies.resetSignalServiceMessageReceiver();
-      if (e instanceof AuthorizationFailedException) {
+      if (e instanceof AuthorizationFailedException && SignalStore.account().isRegistered() && SignalStore.account().getAci() != null) {
         TextSecurePreferences.setUnauthorizedReceived(ApplicationDependencies.getApplication(), true);
       }
       return false;