diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt
index c3b044a5a1..7987272489 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt
@@ -105,13 +105,15 @@ fun VerifySelfSessionView(
             TopAppBar(
                 title = {},
                 actions = {
-                    if (state.verificationFlowStep != FlowStep.Completed) {
-                        if (state.displaySkipButton && LocalInspectionMode.current.not()) {
-                            TextButton(
-                                text = stringResource(CommonStrings.action_skip),
-                                onClick = { state.eventSink(VerifySelfSessionViewEvents.SkipVerification) }
-                            )
-                        }
+                    if (state.verificationFlowStep != FlowStep.Completed &&
+                        state.displaySkipButton &&
+                        LocalInspectionMode.current.not()) {
+                        TextButton(
+                            text = stringResource(CommonStrings.action_skip),
+                            onClick = { state.eventSink(VerifySelfSessionViewEvents.SkipVerification) }
+                        )
+                    }
+                    if (state.verificationFlowStep is FlowStep.Initial) {
                         TextButton(
                             text = stringResource(CommonStrings.action_signout),
                             onClick = { state.eventSink(VerifySelfSessionViewEvents.SignOut) }