diff --git a/app/controllers/concerns/authentication.rb b/app/controllers/concerns/authentication.rb
index deb8b3fa3..4054a3078 100644
--- a/app/controllers/concerns/authentication.rb
+++ b/app/controllers/concerns/authentication.rb
@@ -129,8 +129,9 @@ module Authentication
     end
 
     def serve_development_magic_link(magic_link)
-      if Rails.env.development?
-        flash[:magic_link_code] = magic_link&.code
+      if Rails.env.development? && magic_link.present?
+        flash[:magic_link_code] = magic_link.code
+        response.set_header("X-Magic-Link-Code", magic_link.code)
       end
     end
 end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index e3079c36a..877bc51dd 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -24,7 +24,6 @@ class SessionsController < ApplicationController
     respond_to do |format|
       format.html { redirect_to_session_magic_link magic_link }
       format.json do
-        response.set_header("X-Magic-Link-Code", magic_link&.code) if Rails.env.development? && magic_link
         head :created
       end
     end
@@ -42,6 +41,7 @@ class SessionsController < ApplicationController
 
     def rate_limit_exceeded
       rate_limit_exceeded_message = "Try again later."
+
       respond_to do |format|
         format.html { redirect_to new_session_path, alert: rate_limit_exceeded_message }
         format.json { render json: { message: rate_limit_exceeded_message }, status: :too_many_requests }