diff --git a/app/src/main/java/org/linphone/activities/MainActivity.java b/app/src/main/java/org/linphone/activities/MainActivity.java
index eea09d23c..b2cc4883e 100644
--- a/app/src/main/java/org/linphone/activities/MainActivity.java
+++ b/app/src/main/java/org/linphone/activities/MainActivity.java
@@ -70,6 +70,7 @@ import org.linphone.fragments.EmptyFragment;
 import org.linphone.fragments.StatusBarFragment;
 import org.linphone.history.HistoryActivity;
 import org.linphone.menu.SideMenuFragment;
+import org.linphone.service.LinphoneService;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.settings.SettingsActivity;
 import org.linphone.utils.DeviceUtils;
@@ -428,6 +429,10 @@ public abstract class MainActivity extends LinphoneGenericActivity
     }
 
     private void quit() {
+        if (LinphoneService.isReady()
+                && LinphonePreferences.instance().getServiceNotificationVisibility()) {
+            LinphoneService.instance().stopSelf();
+        }
         goHomeAndClearStack();
     }