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 2040d158f0..a28b727ba4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -452,6 +452,7 @@ public class ConversationListFragment extends MainFragment implements Conversati
     }
 
     if (SignalStore.account().isRegistered() &&
+        SignalStore.registration().isRegistrationComplete() &&
         !TextSecurePreferences.isUnauthorizedReceived(requireContext()) &&
         SignalStore.settings().getAutomaticVerificationEnabled() &&
         SignalStore.misc().getHasKeyTransparencyFailure() &&
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 52343f47c9..0b8560f8b4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckKeyTransparencyJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckKeyTransparencyJob.kt
@@ -90,6 +90,9 @@ class CheckKeyTransparencyJob private constructor(
       return if (!SignalStore.account.isRegistered) {
         Log.i(TAG, "Account not registered. Exiting.")
         false
+      } else if (!SignalStore.registration.isRegistrationComplete) {
+        Log.i(TAG, "Registration is not complete. Exiting.")
+        false
       } else if (TextSecurePreferences.isUnauthorizedReceived(AppDependencies.application)) {
         Log.i(TAG, "Account is unauthorized. Exiting.")
         false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/SelfVerificationFailureSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/verify/SelfVerificationFailureSheet.kt
index e1ff2c01a0..e9b1ff16f1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/verify/SelfVerificationFailureSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/verify/SelfVerificationFailureSheet.kt
@@ -41,6 +41,7 @@ import org.signal.core.ui.compose.ComposeBottomSheetDialogFragment
 import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.horizontalGutters
+import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.CommunicationActions
@@ -56,8 +57,11 @@ class SelfVerificationFailureSheet : ComposeBottomSheetDialogFragment() {
 
   companion object {
 
+    private val TAG = Log.tag(SelfVerificationFailureSheet::class.java)
+
     @JvmStatic
     fun show(fragmentManager: FragmentManager) {
+      Log.i(TAG, "Showing key transparency verification failure sheet")
       SignalStore.misc.hasSeenKeyTransparencyFailure = true
       SelfVerificationFailureSheet().show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
     }