diff --git a/lib/config/setting_keys.dart b/lib/config/setting_keys.dart
index da1b3bbf2..d8522e955 100644
--- a/lib/config/setting_keys.dart
+++ b/lib/config/setting_keys.dart
@@ -53,6 +53,7 @@ enum AppSettings<T> {
   colorSchemeSeedInt<int>('chat.fluffy.color_scheme_seed', 0xFF5625BA),
   emojiSuggestionLocale<String>('emoji_suggestion_locale', ''),
   enableSoftLogout<bool>('chat.fluffy.enable_soft_logout', false),
+  enableMatrixNativeOIDC<bool>('chat.fluffy.enable_matrix_native_oidc', false),
   presetHomeserver<String>('chat.fluffy.preset_homeserver', ''),
   welcomeText<String>('chat.fluffy.welcome_text', '');
 
diff --git a/lib/utils/sign_in_flows/check_homeserver.dart b/lib/utils/sign_in_flows/check_homeserver.dart
index ef0bf94bb..5b1436152 100644
--- a/lib/utils/sign_in_flows/check_homeserver.dart
+++ b/lib/utils/sign_in_flows/check_homeserver.dart
@@ -48,7 +48,7 @@ Future<void> connectToHomeserverFlow(
       if (consent != OkCancelResult.ok) return;
     }
 
-    if (authMetadata != null) {
+    if (authMetadata != null && AppSettings.enableMatrixNativeOIDC.value) {
       await oidcLoginFlow(client, context, signUp);
     } else if (supportsSso) {
       await ssoLoginFlow(client, context, signUp);