diff --git a/src/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt b/src/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt
index 8095731318..cdcdc20e6b 100644
--- a/src/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt
+++ b/src/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt
@@ -24,8 +24,8 @@ class PublicChatManager(private val context: Context) {
     var areAllCaughtUp = true
     refreshChatsAndPollers()
     for ((threadID, chat) in chats) {
-      val poller = pollers[threadID] ?: PublicChatPoller(context, chat)
-      areAllCaughtUp = areAllCaughtUp && poller.isCaughtUp
+      val poller = pollers[threadID]
+      areAllCaughtUp = if(poller != null) areAllCaughtUp && poller.isCaughtUp else false
     }
     return areAllCaughtUp
   }