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 1649652181..a746ea88d2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
@@ -141,6 +141,7 @@ object FcmFetchManager {
   @JvmStatic
   fun onForeground(context: Context) {
     cancelMayHaveMessagesNotification(context)
+    FcmFetchForegroundService.stopServiceIfNecessary(context)
   }
 
   @JvmStatic