diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupManager.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupManager.kt
index 6a342eacda..dbdf2615ae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupManager.kt
@@ -15,7 +15,7 @@ import java.util.concurrent.Executors
 
 object OpenGroupManager {
     private val executorService = Executors.newScheduledThreadPool(4)
-    private var pollers = mutableMapOf<String, OpenGroupPoller>() // One for each server
+    private val pollers = mutableMapOf<String, OpenGroupPoller>() // One for each server
     private var isPolling = false
     private val pollUpdaterLock = Any()
 
@@ -44,9 +44,7 @@ object OpenGroupManager {
         synchronized(pollUpdaterLock) {
             servers.forEach { server ->
                 pollers[server]?.stop() // Shouldn't be necessary
-                val poller = OpenGroupPoller(server, executorService)
-                poller.startIfNeeded()
-                pollers[server] = poller
+                pollers[server] = OpenGroupPoller(server, executorService).apply { startIfNeeded() }
             }
         }
     }
diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupApi.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupApi.kt
index a05addcee2..dc6d1475f8 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupApi.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupApi.kt
@@ -110,24 +110,22 @@ object OpenGroupApi {
         val upload: Boolean = false,
         val defaultUpload: Boolean = false,
     ) {
-        fun toPollInfo(): RoomPollInfo {
-            return RoomPollInfo(
-                token = token,
-                activeUsers = activeUsers,
-                admin = admin,
-                globalAdmin = globalAdmin,
-                moderator = moderator,
-                globalModerator = globalModerator,
-                read = read,
-                defaultRead = defaultRead,
-                defaultAccessible = defaultAccessible,
-                write = write,
-                defaultWrite = defaultWrite,
-                upload = upload,
-                defaultUpload = defaultUpload,
-                details = this
-            )
-        }
+        fun toPollInfo() = RoomPollInfo(
+            token = token,
+            activeUsers = activeUsers,
+            admin = admin,
+            globalAdmin = globalAdmin,
+            moderator = moderator,
+            globalModerator = globalModerator,
+            read = read,
+            defaultRead = defaultRead,
+            defaultAccessible = defaultAccessible,
+            write = write,
+            defaultWrite = defaultWrite,
+            upload = upload,
+            defaultUpload = defaultUpload,
+            details = this
+        )
     }
 
     @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy::class)
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt
index fb7b3b6c8a..387381c9cc 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt
@@ -40,7 +40,7 @@ class OpenGroupPoller(private val server: String, private val executorService: S
     var isCaughtUp = false
     var secondToLastJob: MessageReceiveJob? = null
     private var future: ScheduledFuture<*>? = null
-    private var runId: UUID = UUID.randomUUID()
+    @Volatile private var runId: UUID = UUID.randomUUID()
 
     companion object {
         private const val pollInterval: Long = 4000L
@@ -59,16 +59,20 @@ class OpenGroupPoller(private val server: String, private val executorService: S
 
             // If we don't have an existing group and don't have a 'createGroupIfMissingWithPublicKey'
             // value then don't process the poll info
-            val publicKey = ((existingOpenGroup?.publicKey ?: createGroupIfMissingWithPublicKey) ?: return)
+            val publicKey = existingOpenGroup?.publicKey ?: createGroupIfMissingWithPublicKey
+            val name = pollInfo.details?.name ?: existingOpenGroup?.name
+            val infoUpdates = pollInfo.details?.infoUpdates ?: existingOpenGroup?.infoUpdates
+
+            if (publicKey == null) return
 
             val openGroup = OpenGroup(
                 server = server,
                 room = pollInfo.token,
-                name = ((pollInfo.details?.name ?: existingOpenGroup?.name) ?: ""),
+                name = name ?: "",
                 publicKey = publicKey,
                 imageId = (pollInfo.details?.imageId ?: existingOpenGroup?.imageId),
                 canWrite = pollInfo.write,
-                infoUpdates = ((pollInfo.details?.infoUpdates ?: existingOpenGroup?.infoUpdates) ?: 0)
+                infoUpdates = infoUpdates ?: 0
             )
             // - Open Group changes
             storage.updateOpenGroup(openGroup)