diff --git a/app/controllers/v0/sign_in_controller.rb b/app/controllers/v0/sign_in_controller.rb
index ebfb30e273a..20b805e4d22 100644
--- a/app/controllers/v0/sign_in_controller.rb
+++ b/app/controllers/v0/sign_in_controller.rb
@@ -369,7 +369,8 @@ def cookie_authentication?(client_id)
     end
 
     def client_config(client_id)
-      @client_config ||= SignIn::ClientConfig.find_by(client_id:)
+      @client_config ||= {}
+      @client_config[client_id] ||= SignIn::ClientConfig.find_by(client_id:)
     end
 
     def sign_in_logger