diff --git a/Session/Utilities/BackgroundPoller.swift b/Session/Utilities/BackgroundPoller.swift
index 6c0802ced..f2f0d5f41 100644
--- a/Session/Utilities/BackgroundPoller.swift
+++ b/Session/Utilities/BackgroundPoller.swift
@@ -64,30 +64,37 @@ public final class BackgroundPoller : NSObject {
             guard let snode = swarm.randomElement() else { throw SnodeAPI.Error.generic }
             return attempt(maxRetryCount: 4, recoveringOn: DispatchQueue.main) {
                 var promises: [SnodeAPI.RawResponsePromise] = []
+                var namespaces: [Int] = []
                 // We have to poll for both namespace 0 and -10 when hardfork == 19 && softfork == 0
                 if SnodeAPI.hardfork <= 19, SnodeAPI.softfork == 0 {
                     let promise = SnodeAPI.getRawClosedGroupMessagesFromDefaultNamespace(from: snode, associatedWith: publicKey)
                     promises.append(promise)
+                    namespaces.append(SnodeAPI.defaultNamespace)
                 }
                 if SnodeAPI.hardfork >= 19 && SnodeAPI.softfork >= 0 {
                     let promise = SnodeAPI.getRawMessages(from: snode, associatedWith: publicKey, authenticated: false)
                     promises.append(promise)
+                    namespaces.append(SnodeAPI.closedGroupNamespace)
                 }
-                return when(resolved: promises).then(on: DispatchQueue.main) { rawResponses -> Promise<Void> in
+                return when(resolved: promises).then(on: DispatchQueue.main) { results -> Promise<Void> in
                     var promises: [Promise<Void>] = []
-                    for rawResponse in rawResponses {
-                        let (messages, lastRawMessage) = SnodeAPI.parseRawMessagesResponse(rawResponse, from: snode, associatedWith: publicKey)
-                        let jobPromises = messages.compactMap { json -> Promise<Void>? in
-                            // Use a best attempt approach here; we don't want to fail the entire process if one of the
-                            // messages failed to parse.
-                            guard let envelope = SNProtoEnvelope.from(json),
-                                let data = try? envelope.serializedData() else { return nil }
-                            let job = MessageReceiveJob(data: data, serverHash: json["hash"] as? String, isBackgroundPoll: true)
-                            return job.execute()
+                    var index = 0
+                    for result in results {
+                        if case .fulfilled(let rawResponse) = result {
+                            let (messages, lastRawMessage) = SnodeAPI.parseRawMessagesResponse(rawResponse, from: snode, associatedWith: publicKey)
+                            let jobPromises = messages.compactMap { json -> Promise<Void>? in
+                                // Use a best attempt approach here; we don't want to fail the entire process if one of the
+                                // messages failed to parse.
+                                guard let envelope = SNProtoEnvelope.from(json),
+                                    let data = try? envelope.serializedData() else { return nil }
+                                let job = MessageReceiveJob(data: data, serverHash: json["hash"] as? String, isBackgroundPoll: true)
+                                return job.execute()
+                            }
+                            // Now that the MessageReceiveJob's have been created we can update the `lastMessageHash` value
+                            SnodeAPI.updateLastMessageHashValueIfPossible(for: snode, namespace: namespaces[index], associatedWith: publicKey, from: lastRawMessage)
+                            promises += jobPromises
                         }
-                        // Now that the MessageReceiveJob's have been created we can update the `lastMessageHash` value
-                        SnodeAPI.updateLastMessageHashValueIfPossible(for: snode, namespace: SnodeAPI.defaultNamespace, associatedWith: publicKey, from: lastRawMessage)
-                        promises += jobPromises
+                        index += 1
                     }
                     return when(fulfilled: promises) // The promise returned by MessageReceiveJob never rejects
                 }