diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
index db75acff64..e4290d5bdf 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -338,6 +338,10 @@ class LoggedInFlowNode @AssistedInject constructor(
                             )
                         )
                     }
+
+                    override fun onDone() {
+                        backstack.pop()
+                    }
                 }
                 verifySessionEntryPoint
                     .nodeBuilder(this, buildContext)
diff --git a/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/VerifySessionEntryPoint.kt b/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/VerifySessionEntryPoint.kt
index 5eb1bc8daa..8d19ca5698 100644
--- a/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/VerifySessionEntryPoint.kt
+++ b/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/VerifySessionEntryPoint.kt
@@ -31,5 +31,6 @@ interface VerifySessionEntryPoint : FeatureEntryPoint {
 
     interface Callback : Plugin {
         fun onEnterRecoveryKey()
+        fun onDone()
     }
 }
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt
index 3aa75f0c26..cc97faa6e3 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt
@@ -40,14 +40,20 @@ class VerifySelfSessionNode @AssistedInject constructor(
         }
     }
 
+    private fun onDone() {
+        plugins<VerifySessionEntryPoint.Callback>().forEach {
+            it.onDone()
+        }
+    }
+
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         VerifySelfSessionView(
             state = state,
             modifier = modifier,
-            onEnterRecoveryKey = { onEnterRecoveryKey() },
-            goBack = { navigateUp() }
+            onEnterRecoveryKey = ::onEnterRecoveryKey,
+            goBack = ::onDone,
         )
     }
 }