diff --git a/app/src/main/java/org/linphone/activities/LinphoneLauncherActivity.java b/app/src/main/java/org/linphone/activities/LinphoneLauncherActivity.java
index b2c3a73e7..74c3525f7 100644
--- a/app/src/main/java/org/linphone/activities/LinphoneLauncherActivity.java
+++ b/app/src/main/java/org/linphone/activities/LinphoneLauncherActivity.java
@@ -97,10 +97,6 @@ public class LinphoneLauncherActivity extends Activity {
                         intent.setAction(getIntent().getAction());
                         intent.setType(getIntent().getType());
                         startActivity(intent);
-
-                        LinphoneService.instance()
-                                .getNotificationManager()
-                                .removeForegroundServiceNotificationIfPossible();
                     }
                 },
                 100);
diff --git a/app/src/main/java/org/linphone/activities/MainActivity.java b/app/src/main/java/org/linphone/activities/MainActivity.java
index 8ad37e26b..bdcebae3e 100644
--- a/app/src/main/java/org/linphone/activities/MainActivity.java
+++ b/app/src/main/java/org/linphone/activities/MainActivity.java
@@ -301,6 +301,10 @@ public abstract class MainActivity extends LinphoneGenericActivity
     protected void onResume() {
         super.onResume();
 
+        LinphoneService.instance()
+                .getNotificationManager()
+                .removeForegroundServiceNotificationIfPossible();
+
         hideTopBar();
         if (!mAlwaysHideTabBar
                 && (getFragmentManager().getBackStackEntryCount() == 0
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.java b/app/src/main/java/org/linphone/notifications/NotificationsManager.java
index 91af745fd..a93113363 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.java
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.java
@@ -236,8 +236,8 @@ public class NotificationsManager {
     }
 
     public void removeForegroundServiceNotificationIfPossible() {
-        if (!isServiceNotificationDisplayed()
-                && mCurrentForegroundServiceNotification == SERVICE_NOTIF_ID) {
+        if (mCurrentForegroundServiceNotification == SERVICE_NOTIF_ID
+                && !isServiceNotificationDisplayed()) {
             stopForeground();
         }
     }