diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt
index daf457b28c..57f5922a96 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt
@@ -70,8 +70,12 @@ class StoriesLandingRepository(context: Context) {
         createStoriesLandingItemData(recipient, messages)
       }
 
-      Observable.combineLatest(observables) {
-        it.toList() as List<StoriesLandingItemData>
+      if (observables.isEmpty()) {
+        Observable.just(emptyList())
+      } else {
+        Observable.combineLatest(observables) {
+          it.toList() as List<StoriesLandingItemData>
+        }
       }
     }
   }