diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt
index 74dd49e933..27f757bdc0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt
@@ -69,7 +69,7 @@ object Stories {
    */
   @JvmStatic
   fun isFeatureFlagEnabled(): Boolean {
-    return FeatureFlags.stories() || LocaleFeatureFlags.isInStoriesCountry()
+    return SignalStore.account().isRegistered && (FeatureFlags.stories() || LocaleFeatureFlags.isInStoriesCountry())
   }
 
   /**
@@ -81,7 +81,7 @@ object Stories {
    */
   @JvmStatic
   fun isFeatureAvailable(): Boolean {
-    return SignalStore.account().isRegistered && isFeatureFlagEnabled() && Recipient.self().storiesCapability == Recipient.Capability.SUPPORTED
+    return isFeatureFlagEnabled() && Recipient.self().storiesCapability == Recipient.Capability.SUPPORTED
   }
 
   /**