diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
index d2e1a03cf5..f9e9624503 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
@@ -17,6 +17,7 @@
 package io.element.android.features.login.impl.changeserver
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -61,7 +62,9 @@ fun ChangeServerView(
             }
         }
         is Async.Loading -> ProgressDialog()
-        is Async.Success -> onDone()
+        is Async.Success -> LaunchedEffect(state.changeServerAction) {
+            onDone()
+        }
         Async.Uninitialized -> Unit
     }
 }