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 3d58e4fbd..fa039b60c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
@@ -83,7 +83,12 @@ object FcmFetchManager {
         context.stopService(Intent(context, FcmFetchBackgroundService::class.java))
 
         if (startedForeground) {
-          context.startService(FcmFetchForegroundService.buildStopIntent(context))
+          try {
+            context.startService(FcmFetchForegroundService.buildStopIntent(context))
+          } catch (e: IllegalStateException) {
+            Log.w(TAG, "Failed to stop the foreground notification!", e)
+          }
+
           startedForeground = false
         }
       }