diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt b/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
index 60024d4c19..069b303b42 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
@@ -54,6 +54,11 @@ class DebugFeaturesStateFactory @Inject constructor(
                         key = DebugFeatureKeys.onboardingPersonalize,
                         factory = VectorFeatures::isOnboardingPersonalizeEnabled
                 ),
+                createBooleanFeature(
+                        label = "FTUE Personalize combined choose server",
+                        key = DebugFeatureKeys.onboardingCombinedChooseServer,
+                        factory = VectorFeatures::isOnboardingCombinedChooseServerEnabled
+                ),
                 createBooleanFeature(
                         label = "Live location sharing",
                         key = DebugFeatureKeys.liveLocationSharing,
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt b/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
index ec3de1408a..62997d907f 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
@@ -54,6 +54,9 @@ class DebugVectorFeatures(
     override fun isOnboardingPersonalizeEnabled(): Boolean = read(DebugFeatureKeys.onboardingPersonalize)
             ?: vectorFeatures.isOnboardingPersonalizeEnabled()
 
+    override fun isOnboardingCombinedChooseServerEnabled(): Boolean = read(DebugFeatureKeys.onboardingCombinedChooseServer)
+            ?: vectorFeatures.isOnboardingCombinedChooseServerEnabled()
+
     override fun isLiveLocationEnabled(): Boolean = read(DebugFeatureKeys.liveLocationSharing)
             ?: vectorFeatures.isLiveLocationEnabled()
 
@@ -109,5 +112,6 @@ object DebugFeatureKeys {
     val onboardingSplashCarousel = booleanPreferencesKey("onboarding-splash-carousel")
     val onboardingUseCase = booleanPreferencesKey("onbboarding-splash-carousel")
     val onboardingPersonalize = booleanPreferencesKey("onbboarding-personalize")
+    val onboardingCombinedChooseServer = booleanPreferencesKey("onbboarding-combined-choose-server")
     val liveLocationSharing = booleanPreferencesKey("live-location-sharing")
 }
diff --git a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
index 52ad9242f4..cdb82af827 100644
--- a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
+++ b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
@@ -25,6 +25,7 @@ interface VectorFeatures {
     fun isOnboardingSplashCarouselEnabled(): Boolean
     fun isOnboardingUseCaseEnabled(): Boolean
     fun isOnboardingPersonalizeEnabled(): Boolean
+    fun isOnboardingCombinedChooseServerEnabled(): Boolean
     fun isLiveLocationEnabled(): Boolean
 
     enum class OnboardingVariant {
@@ -40,5 +41,6 @@ class DefaultVectorFeatures : VectorFeatures {
     override fun isOnboardingSplashCarouselEnabled() = true
     override fun isOnboardingUseCaseEnabled() = true
     override fun isOnboardingPersonalizeEnabled() = false
+    override fun isOnboardingCombinedChooseServerEnabled() = false
     override fun isLiveLocationEnabled(): Boolean = BuildConfig.ENABLE_LIVE_LOCATION_SHARING
 }