diff --git a/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceAddParticipantsFragment.kt b/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceAddParticipantsFragment.kt
index 4bba36a4c..099472524 100644
--- a/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceAddParticipantsFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceAddParticipantsFragment.kt
@@ -57,7 +57,12 @@ class ConferenceAddParticipantsFragment : GenericAddressPickerFragment() {
     }
 
     override fun goBack(): Boolean {
-        return findNavController().popBackStack()
+        try {
+            return findNavController().popBackStack()
+        } catch (ise: IllegalStateException) {
+            Log.e("$TAG Can't go back popping back stack: $ise")
+        }
+        return false
     }
 
     override fun onSingleAddressSelected(address: Address, friend: Friend) {
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDocumentsListFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDocumentsListFragment.kt
index c90468a7f..3454cc767 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDocumentsListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDocumentsListFragment.kt
@@ -59,7 +59,12 @@ class ConversationDocumentsListFragment : SlidingPaneChildFragment() {
     private val args: ConversationMediaListFragmentArgs by navArgs()
 
     override fun goBack(): Boolean {
-        return findNavController().popBackStack()
+        try {
+            return findNavController().popBackStack()
+        } catch (ise: IllegalStateException) {
+            Log.e("$TAG Can't go back popping back stack: $ise")
+        }
+        return false
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationEphemeralLifetimeFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationEphemeralLifetimeFragment.kt
index 0034aefca..96332c9c5 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationEphemeralLifetimeFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationEphemeralLifetimeFragment.kt
@@ -46,7 +46,12 @@ class ConversationEphemeralLifetimeFragment : SlidingPaneChildFragment() {
     private val args: ConversationEphemeralLifetimeFragmentArgs by navArgs()
 
     override fun goBack(): Boolean {
-        return findNavController().popBackStack()
+        try {
+            return findNavController().popBackStack()
+        } catch (ise: IllegalStateException) {
+            Log.e("$TAG Can't go back popping back stack: $ise")
+        }
+        return false
     }
 
     override fun onCreateView(
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt
index 16dde38b4..173a7f91e 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt
@@ -64,7 +64,12 @@ class ConversationInfoFragment : SlidingPaneChildFragment() {
     private val args: ConversationInfoFragmentArgs by navArgs()
 
     override fun goBack(): Boolean {
-        return findNavController().popBackStack()
+        try {
+            return findNavController().popBackStack()
+        } catch (ise: IllegalStateException) {
+            Log.e("$TAG Can't go back popping back stack: $ise")
+        }
+        return false
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt
index 17b47c47e..3370ccb6f 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt
@@ -60,7 +60,12 @@ class ConversationMediaListFragment : SlidingPaneChildFragment() {
     private val args: ConversationMediaListFragmentArgs by navArgs()
 
     override fun goBack(): Boolean {
-        return findNavController().popBackStack()
+        try {
+            return findNavController().popBackStack()
+        } catch (ise: IllegalStateException) {
+            Log.e("$TAG Can't go back popping back stack: $ise")
+        }
+        return false
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/org/linphone/ui/main/fragment/AddParticipantsFragment.kt b/app/src/main/java/org/linphone/ui/main/fragment/AddParticipantsFragment.kt
index 6758e5a96..84462060a 100644
--- a/app/src/main/java/org/linphone/ui/main/fragment/AddParticipantsFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/fragment/AddParticipantsFragment.kt
@@ -57,7 +57,12 @@ class AddParticipantsFragment : GenericAddressPickerFragment() {
     }
 
     override fun goBack(): Boolean {
-        return findNavController().popBackStack()
+        try {
+            return findNavController().popBackStack()
+        } catch (ise: IllegalStateException) {
+            Log.e("$TAG Can't go back popping back stack: $ise")
+        }
+        return false
     }
 
     override fun onSingleAddressSelected(address: Address, friend: Friend) {
diff --git a/app/src/main/java/org/linphone/ui/main/meetings/fragment/EditMeetingFragment.kt b/app/src/main/java/org/linphone/ui/main/meetings/fragment/EditMeetingFragment.kt
index 3b9c646f4..f086e5f8b 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/fragment/EditMeetingFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/fragment/EditMeetingFragment.kt
@@ -76,7 +76,12 @@ class EditMeetingFragment : SlidingPaneChildFragment() {
     }
 
     override fun goBack(): Boolean {
-        return findNavController().popBackStack()
+        try {
+            return findNavController().popBackStack()
+        } catch (ise: IllegalStateException) {
+            Log.e("$TAG Can't go back popping back stack: $ise")
+        }
+        return false
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingWaitingRoomFragment.kt b/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingWaitingRoomFragment.kt
index e6d906388..41832d3bf 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingWaitingRoomFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingWaitingRoomFragment.kt
@@ -79,7 +79,12 @@ class MeetingWaitingRoomFragment : GenericMainFragment() {
     }
 
     override fun goBack(): Boolean {
-        return findNavController().popBackStack()
+        try {
+            return findNavController().popBackStack()
+        } catch (ise: IllegalStateException) {
+            Log.e("$TAG Can't go back popping back stack: $ise")
+        }
+        return false
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/org/linphone/ui/main/meetings/fragment/ScheduleMeetingFragment.kt b/app/src/main/java/org/linphone/ui/main/meetings/fragment/ScheduleMeetingFragment.kt
index c9aadeeac..042f53108 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/fragment/ScheduleMeetingFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/fragment/ScheduleMeetingFragment.kt
@@ -76,7 +76,12 @@ class ScheduleMeetingFragment : GenericMainFragment() {
     }
 
     override fun goBack(): Boolean {
-        return findNavController().popBackStack()
+        try {
+            return findNavController().popBackStack()
+        } catch (ise: IllegalStateException) {
+            Log.e("$TAG Can't go back popping back stack: $ise")
+        }
+        return false
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt
index d17daf5b7..7d5926b7e 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt
@@ -71,7 +71,12 @@ class AccountSettingsFragment : GenericMainFragment() {
     }
 
     override fun goBack(): Boolean {
-        return findNavController().popBackStack()
+        try {
+            return findNavController().popBackStack()
+        } catch (ise: IllegalStateException) {
+            Log.e("$TAG Can't go back popping back stack: $ise")
+        }
+        return false
     }
 
     override fun onCreateView(