diff --git a/src/org/thoughtcrime/securesms/loki/api/BackgroundPollJob.kt b/src/org/thoughtcrime/securesms/loki/api/BackgroundPollJob.kt
index 1cf97b3c64..b89d051554 100644
--- a/src/org/thoughtcrime/securesms/loki/api/BackgroundPollJob.kt
+++ b/src/org/thoughtcrime/securesms/loki/api/BackgroundPollJob.kt
@@ -50,13 +50,16 @@ class BackgroundPollJob private constructor(parameters: Parameters) : BaseJob(pa
             Log.d("Loki", "Performing background poll.")
             val userPublicKey = TextSecurePreferences.getLocalNumber(context)
             val promises = mutableListOf<Promise<Unit, Exception>>()
-            val promise = SnodeAPI.shared.getMessages(userPublicKey).map { envelopes ->
-                envelopes.forEach {
-                    PushContentReceiveJob(context).processEnvelope(SignalServiceEnvelope(it), false)
+            if (!TextSecurePreferences.isUsingFCM(context)) {
+                Log.d("Loki", "Not using FCM, poll for contacts and closed groups.")
+                val promise = SnodeAPI.shared.getMessages(userPublicKey).map { envelopes ->
+                    envelopes.forEach {
+                        PushContentReceiveJob(context).processEnvelope(SignalServiceEnvelope(it), false)
+                    }
                 }
+                promises.add(promise)
+                promises.addAll(ClosedGroupPoller.shared.pollOnce())
             }
-            promises.add(promise)
-            promises.addAll(ClosedGroupPoller.shared.pollOnce())
             val openGroups = DatabaseFactory.getLokiThreadDatabase(context).getAllPublicChats().map { it.value }
             for (openGroup in openGroups) {
                 val poller = PublicChatPoller(context, openGroup)