diff --git a/changelog.d/4969.bugfix b/changelog.d/4969.bugfix
new file mode 100644
index 0000000000..6edfd498bf
--- /dev/null
+++ b/changelog.d/4969.bugfix
@@ -0,0 +1 @@
+Fixes sign in/up crash when selecting ems and other server types which use SSO
\ No newline at end of file
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 5d1e0fdade..4b3ce14002 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
@@ -826,13 +826,17 @@ class OnboardingViewModel @AssistedInject constructor(
             }
 
             withState {
-                when (it.onboardingFlow) {
-                    OnboardingFlow.SignIn -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignIn))
-                    OnboardingFlow.SignUp -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignUp))
-                    OnboardingFlow.SignInSignUp,
-                    null                  -> {
-                        _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
+                if (it.serverType == ServerType.MatrixOrg) {
+                    when (it.onboardingFlow) {
+                        OnboardingFlow.SignIn -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignIn))
+                        OnboardingFlow.SignUp -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignUp))
+                        OnboardingFlow.SignInSignUp,
+                        null                  -> {
+                            _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
+                        }
                     }
+                } else {
+                    _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
                 }
             }
         }