diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 44c352885..cc68144eb 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -1405,6 +1405,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
         return TaskStackBuilder.create(context).run {
             addNextIntentWithParentStack(
                 Intent(context, MainActivity::class.java).apply {
+                    setAction(Intent.ACTION_MAIN) // Needed as well
                     putExtras(args) // Need to pass args here for Chat extra
                 }
             )
diff --git a/app/src/main/java/org/linphone/ui/main/MainActivity.kt b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
index bc658112b..9c377309f 100644
--- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt
+++ b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
@@ -432,9 +432,9 @@ class MainActivity : GenericActivity() {
         Log.i(
             "$TAG Handling intent action [${intent.action}], type [${intent.type}], data [${intent.data}] and has ${if (hasExtra) "extras" else "no extra"}"
         )
-        if (intent.action == null) return
 
-        when (intent.action) {
+        val action = intent.action ?: return
+        when (action) {
             Intent.ACTION_SEND -> {
                 handleSendIntent(intent, false)
             }