diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js
index 90be4e447..b59054b8d 100644
--- a/ui/admin/config/environment.js
+++ b/ui/admin/config/environment.js
@@ -85,7 +85,7 @@ module.exports = function (environment) {
     },
 
     featureFlags: {
-      'primary-auth-method': true,
+      'primary-auth-method': false,
     },
   };
 
diff --git a/ui/admin/tests/acceptance/auth-methods-test.js b/ui/admin/tests/acceptance/auth-methods-test.js
index 27bbe2db2..e6ffacb4d 100644
--- a/ui/admin/tests/acceptance/auth-methods-test.js
+++ b/ui/admin/tests/acceptance/auth-methods-test.js
@@ -10,6 +10,7 @@ import {
   //   //currentSession,
   //   //invalidateSession,
 } from 'ember-simple-auth/test-support';
+import { enableFeature } from 'ember-feature-flags/test-support';
 
 module('Acceptance | auth methods', function (hooks) {
   setupApplicationTest(hooks);
@@ -277,6 +278,7 @@ module('Acceptance | auth methods', function (hooks) {
       instances.scopes.org.primaryAuthMethodId,
       'Primary auth method is not yet set.'
     );
+    enableFeature('primary-auth-method');
     await visit(urls.authMethod);
     await click(
       '.rose-layout-page-actions .rose-dropdown-content [type="button"]:first-child'
@@ -306,6 +308,7 @@ module('Acceptance | auth methods', function (hooks) {
       instances.scopes.org.primaryAuthMethodId,
       'Primary auth method is not yet set.'
     );
+    enableFeature('primary-auth-method');
     await visit(urls.authMethod);
     await click(
       '.rose-layout-page-actions .rose-dropdown-content [type="button"]:first-child'
@@ -322,6 +325,7 @@ module('Acceptance | auth methods', function (hooks) {
       instances.scopes.org.primaryAuthMethodId,
       'Primary auth method is set.'
     );
+    enableFeature('primary-auth-method');
     await visit(urls.authMethod);
     await click(
       '.rose-layout-page-actions .rose-dropdown-content [type="button"]:first-child'
@@ -350,6 +354,7 @@ module('Acceptance | auth methods', function (hooks) {
       instances.scopes.org.primaryAuthMethodId,
       'Primary auth method is set.'
     );
+    enableFeature('primary-auth-method');
     await visit(urls.authMethod);
     await click(
       '.rose-layout-page-actions .rose-dropdown-content [type="button"]:first-child'