diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 153ac84be5..a2548ff1ac 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -96,7 +96,9 @@ def sms_acct_creation_notice(resource_name, sms_status)
   end
 
   def store_referring_location
-    session[:return_to] = request.referer unless request.referer.end_with?("users/sign_in")
+    if request.referer && !request.referer.end_with?("users/sign_in")
+      session[:return_to] = request.referer
+    end
   end
 
   def redirect_back_to_referer(fallback_location:)