diff --git a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
index cdadc2b63f..bd3c754882 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
@@ -48,8 +48,12 @@ object FcmFetchManager {
       try {
         if (foreground) {
           Log.i(TAG, "Starting in the foreground.")
-          ForegroundServiceUtil.startWhenCapableOrThrow(context, Intent(context, FcmFetchForegroundService::class.java), MAX_BLOCKING_TIME_MS)
-          startedForeground = true
+          if (!startedForeground) {
+            ForegroundServiceUtil.startWhenCapableOrThrow(context, Intent(context, FcmFetchForegroundService::class.java), MAX_BLOCKING_TIME_MS)
+            startedForeground = true
+          } else {
+            Log.i(TAG, "Already started foreground service")
+          }
         } else {
           Log.i(TAG, "Starting in the background.")
           context.startService(Intent(context, FcmFetchBackgroundService::class.java))
@@ -72,13 +76,6 @@ object FcmFetchManager {
     return true
   }
 
-  @JvmStatic
-  fun isForegroundStarted(): Boolean {
-    synchronized(this) {
-      return startedForeground
-    }
-  }
-
   private fun fetch(context: Context) {
     retrieveMessages(context)