diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index 824779b65a..f8676f8242 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -435,7 +435,8 @@ public class ConversationListFragment extends MainFragment implements Conversati
       onSearchQueryUpdated(query);
     }
 
-    if (SignalStore.settings().getAutomaticVerificationEnabled() &&
+    if (SignalStore.account().isRegistered() &&
+        SignalStore.settings().getAutomaticVerificationEnabled() &&
         SignalStore.misc().getHasKeyTransparencyFailure() &&
         !SignalStore.misc().getHasSeenKeyTransparencyFailure()) {
       SelfVerificationFailureSheet.show(getParentFragmentManager());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckKeyTransparencyJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckKeyTransparencyJob.kt
index 258893da78..aef1cb0703 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckKeyTransparencyJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckKeyTransparencyJob.kt
@@ -167,9 +167,11 @@ class CheckKeyTransparencyJob private constructor(
    * For others, it will only show once and only be cleared on the next successful verification.
    */
   private fun markFailure() {
-    SignalStore.misc.hasKeyTransparencyFailure = true
-    if (RemoteConfig.internalUser) {
-      SignalStore.misc.hasSeenKeyTransparencyFailure = false
+    if (SignalStore.account.isRegistered) {
+      SignalStore.misc.hasKeyTransparencyFailure = true
+      if (RemoteConfig.internalUser) {
+        SignalStore.misc.hasSeenKeyTransparencyFailure = false
+      }
     }
   }