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 73288bd6d5..6106d84a8d 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
@@ -71,7 +71,7 @@ import java.util.concurrent.CancellationException
  *
  */
 class OnboardingViewModel @AssistedInject constructor(
-        @Assisted initialState: OnboardingViewState,
+        @Assisted private val initialState: OnboardingViewState,
         private val applicationContext: Context,
         private val authenticationService: AuthenticationService,
         private val activeSessionHolder: ActiveSessionHolder,
@@ -123,9 +123,6 @@ class OnboardingViewModel @AssistedInject constructor(
     private val registrationWizard: RegistrationWizard
         get() = authenticationService.getRegistrationWizard()
 
-    val currentThreePid: String?
-        get() = registrationWizard.getCurrentThreePid()
-
     // True when login and password has been sent with success to the homeserver
     val isRegistrationStarted: Boolean
         get() = authenticationService.isRegistrationStarted()
@@ -492,17 +489,6 @@ class OnboardingViewModel @AssistedInject constructor(
 
     private fun handleInitWith(action: OnboardingAction.InitWith) {
         loginConfig = action.loginConfig
-        // If there is a pending email validation continue on this step
-        try {
-            if (registrationWizard.isRegistrationStarted()) {
-                currentThreePid?.let {
-                    handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnSendEmailSuccess(it, isRestoredSession = true)))
-                }
-            }
-        } catch (e: Throwable) {
-            // NOOP. API is designed to use wizards in a login/registration flow,
-            // but we need to check the state anyway.
-        }
     }
 
     private fun handleResetPassword(action: OnboardingAction.ResetPassword) {
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
index b505d05944..93195e2f12 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
@@ -191,21 +191,6 @@ class OnboardingViewModelTest {
                 .finish()
     }
 
-    @Test
-    fun `given registration started with currentThreePid, when handling InitWith, then emits restored session OnSendEmailSuccess`() = runTest {
-        val test = viewModel.test()
-        fakeAuthenticationService.givenRegistrationWizard(FakeRegistrationWizard().also {
-            it.givenRegistrationStarted(hasStarted = true)
-            it.givenCurrentThreePid(AN_EMAIL)
-        })
-
-        viewModel.handle(OnboardingAction.InitWith(LoginConfig(A_HOMESERVER_URL, identityServerUrl = null)))
-
-        test
-                .assertEvents(OnboardingViewEvents.OnSendEmailSuccess(AN_EMAIL, isRestoredSession = true))
-                .finish()
-    }
-
     @Test
     fun `given registration not started, when handling InitWith, then does nothing`() = runTest {
         val test = viewModel.test()