diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 76c3583bc..03c5e3dbb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -224,7 +224,7 @@ class ApplicationController < ActionController::Base
   def redirect_if_untrusted
     if instructeur_signed_in? &&
         sensitive_path &&
-        !feature_enabled?(:instructeur_bypass_email_login_token) &&
+        !current_instructeur.bypass_email_login_token &&
         !IPService.ip_trusted?(request.headers['X-Forwarded-For']) &&
         !trusted_device?
 
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 488c71a9d..e7a43ce8b 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -165,7 +165,7 @@ describe ApplicationController, type: :controller do
       let(:sensitive_path) { true }
 
       before do
-        Flipper.disable(:instructeur_bypass_email_login_token)
+        current_instructeur.update!(bypass_email_login_token: false)
       end
 
       context 'when the instructeur is signed_in' do