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 dcd7e6c8e..234d5da9b 100644
--- a/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt
+++ b/app/src/main/java/org/linphone/activities/call/IncomingCallActivity.kt
@@ -61,14 +61,14 @@ class IncomingCallActivity : GenericActivity() {
         if (incomingCall == null) {
             Log.e("[Incoming Call Activity] Couldn't find call in state Incoming")
             if (isTaskRoot) {
+                Log.i("[Incoming Call Activity] Task is root, starting MainActivity")
                 // When resuming app from recent tasks make sure MainActivity will be launched if there is no call
                 val intent = Intent()
                 intent.setClass(this, MainActivity::class.java)
                 intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 startActivity(intent)
-            } else {
-                finish()
             }
+            finish()
             return
         }
 
@@ -118,14 +118,14 @@ class IncomingCallActivity : GenericActivity() {
         if (incomingCall == null) {
             Log.e("[Incoming Call Activity] Couldn't find call in state Incoming")
             if (isTaskRoot) {
+                Log.i("[Incoming Call Activity] Task is root, starting MainActivity")
                 // When resuming app from recent tasks make sure MainActivity will be launched if there is no call
                 val intent = Intent()
                 intent.setClass(this, MainActivity::class.java)
                 intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 startActivity(intent)
-            } else {
-                finish()
             }
+            finish()
         }
     }
 
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 276a63b71..1bde5f34c 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -458,7 +458,7 @@ class NotificationsManager(private val context: Context) {
             context,
             0,
             incomingCallNotificationIntent,
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
 
         val notification = Compatibility.createIncomingCallNotification(context, call, notifiable, pendingIntent, this)