diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomListDataSource.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomListDataSource.kt
index 09826ca1e..4df78423a 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomListDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomListDataSource.kt
@@ -44,9 +44,11 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
         )
     )
 
-    fun createMyChannelsFilter(): TypedFilter {
+    fun createMyChannelsFilter(): TypedFilter? {
         val followingEvents = account.selectedChatsFollowList()
 
+        if (followingEvents.isEmpty()) return null
+
         return TypedFilter(
             types = COMMON_FEED_TYPES, // Metadata comes from any relay
             filter = JsonFilter(
@@ -60,6 +62,8 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
     fun createLastChannelInfoFilter(): List<TypedFilter>? {
         val followingEvents = account.selectedChatsFollowList()
 
+        if (followingEvents.isEmpty()) return null
+
         return followingEvents.map {
             TypedFilter(
                 types = COMMON_FEED_TYPES, // Metadata comes from any relay
@@ -75,6 +79,8 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
     fun createLastMessageOfEachChannelFilter(): List<TypedFilter>? {
         val followingEvents = account.selectedChatsFollowList()
 
+        if (followingEvents.isEmpty()) return null
+
         return followingEvents.map {
             TypedFilter(
                 types = setOf(FeedType.PUBLIC_CHATS),
@@ -93,7 +99,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
     }
 
     override fun updateChannelFilters() {
-        val list = listOf(
+        val list = listOfNotNull(
             createMessagesToMeFilter(),
             createMessagesFromMeFilter(),
             createMyChannelsFilter()