diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerRepository.kt
index 7990c759c4..1baf08776d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerRepository.kt
@@ -19,7 +19,22 @@ class StoryViewerRepository {
 
       val myStory: RecipientId = SignalDatabase.recipients.getOrInsertFromDistributionListId(DistributionListId.MY_STORY)
 
-      listOf(myStory) + doNotCollapse
+      val myStoriesCount = SignalDatabase.mms.allOutgoingStories.use {
+        var count = 0
+        while (it.next != null) {
+          if (!it.current.recipient.isGroup) {
+            count++
+          }
+        }
+
+        count
+      }
+
+      if (myStoriesCount > 0) {
+        listOf(myStory) + doNotCollapse
+      } else {
+        doNotCollapse
+      }
     }.subscribeOn(Schedulers.io())
   }
 }