diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 47d14f156..645d02e57 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -121,16 +121,16 @@
             android:windowSoftInputMode="adjustResize"/>
 
         <activity android:name=".activities.call.CallActivity"
-            android:launchMode="singleTop"
+            android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true" />
 
         <activity android:name=".activities.call.IncomingCallActivity"
-            android:launchMode="singleTop"
+            android:launchMode="singleTask"
             android:noHistory="true" />
 
         <activity android:name=".activities.call.OutgoingCallActivity"
-            android:launchMode="singleTop"
+            android:launchMode="singleTask"
             android:noHistory="true" />
 
         <activity
diff --git a/app/src/main/java/org/linphone/activities/call/CallActivity.kt b/app/src/main/java/org/linphone/activities/call/CallActivity.kt
index 2ef7eb13e..d4e9b0c50 100644
--- a/app/src/main/java/org/linphone/activities/call/CallActivity.kt
+++ b/app/src/main/java/org/linphone/activities/call/CallActivity.kt
@@ -109,9 +109,8 @@ class CallActivity : ProximitySensorActivity() {
                 intent.setClass(this, MainActivity::class.java)
                 intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 startActivity(intent)
-            } else {
-                finish()
             }
+            finish()
         } else {
             coreContext.removeCallOverlay()
         }
diff --git a/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt b/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt
index 234d5da9b..9cd74f4d0 100644
--- a/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt
+++ b/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt
@@ -49,10 +49,10 @@ class IncomingCallActivity : GenericActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        Compatibility.setShowWhenLocked(this, true)
-        Compatibility.setTurnScreenOn(this, true)
         // Leaks on API 27+: https://stackoverflow.com/questions/60477120/keyguardmanager-memory-leak
         Compatibility.requestDismissKeyguard(this)
+        Compatibility.setShowWhenLocked(this, true)
+        Compatibility.setTurnScreenOn(this, true)
 
         binding = DataBindingUtil.setContentView(this, R.layout.call_incoming_activity)
         binding.lifecycleOwner = this
diff --git a/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt b/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt
index deda3e9d7..f78b2f091 100644
--- a/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt
@@ -101,9 +101,11 @@ class ControlsFragment : GenericFragment<CallControlsFragmentBinding>() {
         callsViewModel.noMoreCallEvent.observe(
             viewLifecycleOwner
         ) {
-            it.consume {
-                Log.i("[Controls Fragment] No more call, finishing activity")
-                requireActivity().finish()
+            it.consume { noMoreCall ->
+                if (noMoreCall) {
+                    Log.i("[Controls Fragment] No more call, finishing activity")
+                    requireActivity().finish()
+                }
             }
         }
 
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 1bde5f34c..ebbf52701 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -445,6 +445,17 @@ class NotificationsManager(private val context: Context) {
             return
         }
 
+        try {
+            val showLockScreenNotification = android.provider.Settings.Secure.getInt(
+                context.contentResolver,
+                "lock_screen_show_notifications",
+                0
+            )
+            Log.i("[Notifications Manager] Are notifications allowed on lock screen? ${showLockScreenNotification != 0} ($showLockScreenNotification)")
+        } catch (e: Exception) {
+            Log.e("[Notifications Manager] Failed to get android.provider.Settings.Secure.getInt(lock_screen_show_notifications): $e")
+        }
+
         val notifiable = getNotifiableForCall(call)
         if (notifiable.notificationId == currentForegroundServiceNotificationId) {
             Log.e("[Notifications Manager] There is already a Service foreground notification for an incoming call, cancelling it")
@@ -453,7 +464,7 @@ class NotificationsManager(private val context: Context) {
         }
 
         val incomingCallNotificationIntent = Intent(context, IncomingCallActivity::class.java)
-        incomingCallNotificationIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        incomingCallNotificationIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_NO_USER_ACTION)
         val pendingIntent = PendingIntent.getActivity(
             context,
             0,