diff --git a/app/src/main/java/org/linphone/assistant/AssistantActivity.java b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
index e4a526e7e..7dfaa4ec9 100644
--- a/app/src/main/java/org/linphone/assistant/AssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
@@ -28,6 +28,7 @@ import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.ImageView;
 import org.linphone.LinphoneManager;
+import org.linphone.LinphoneService;
 import org.linphone.R;
 import org.linphone.activities.DialerActivity;
 import org.linphone.activities.ThemeableActivity;
@@ -107,6 +108,11 @@ public abstract class AssistantActivity extends ThemeableActivity
         if (useLinphoneDefaultValues) {
             // Restore default values
             core.loadConfigFromXml(LinphoneManager.getInstance().getDefaultDynamicConfigFile());
+        } else {
+            // If this isn't a sip.linphone.org account, disable push notifications and enable
+            // service notification, otherwise incoming calls won't work (most probably)
+            LinphonePreferences.instance().setServiceNotificationVisibility(true);
+            LinphoneService.instance().getNotificationManager().startForeground();
         }
 
         if (proxyConfig == null) {