diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index 3e4ea68317..07a7933d4b 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -464,22 +464,14 @@ class OnboardingViewModel @AssistedInject constructor(
     }
 
     private fun handleUpdateUseCase(action: OnboardingAction.UpdateUseCase) {
-        viewModelScope.launch {
-            onboardingStore.setUseCase(action.useCase)
-            analyticsTracker.updateUserProperties(
-                    Identity(ftueUseCaseSelection = action.useCase.toTrackingValue())
-            )
-        }
+        setState { copy(useCase = action.useCase) }
+        analyticsTracker.updateUserProperties(Identity(ftueUseCaseSelection = action.useCase.toTrackingValue()))
         _viewEvents.post(OnboardingViewEvents.OpenServerSelection)
     }
 
     private fun resetUseCase() {
-        viewModelScope.launch {
-            onboardingStore.resetUseCase()
-            analyticsTracker.updateUserProperties(
-                    Identity(ftueUseCaseSelection = null)
-            )
-        }
+        setState { copy(useCase = null) }
+        analyticsTracker.updateUserProperties(Identity(ftueUseCaseSelection = null))
     }
 
     private fun handleUpdateServerType(action: OnboardingAction.UpdateServerType) {
@@ -760,6 +752,9 @@ class OnboardingViewModel @AssistedInject constructor(
     }
 
     private suspend fun onSessionCreated(session: Session) {
+        awaitState().useCase?.let { useCase ->
+            onboardingStore.setUseCase(useCase)
+        }
         activeSessionHolder.setActiveSession(session)
 
         authenticationService.reset()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
index fd25f3901e..d05a8294f6 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
@@ -40,6 +40,8 @@ data class OnboardingViewState(
         @PersistState
         val serverType: ServerType = ServerType.Unknown,
         @PersistState
+        val useCase: FtueUseCase? = null,
+        @PersistState
         val signMode: SignMode = SignMode.Unknown,
         @PersistState
         val resetPasswordEmail: String? = null,