diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrThreadDataSource.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrThreadDataSource.kt
index 2032f551e..7f73ac5a2 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrThreadDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrThreadDataSource.kt
@@ -17,10 +17,12 @@ object NostrThreadDataSource : NostrDataSource("SingleThreadFeed") {
             .toSet()
             .ifEmpty { null } ?: return null
 
+        if (eventsToLoad.isEmpty()) return null
+
         return TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                ids = eventsToLoad.map { it.substring(0, 8) }
+                ids = eventsToLoad.toList()
             )
         )
     }