diff --git a/apps/boruta_web/lib/boruta_web/controllers/oauth/authorize_controller.ex b/apps/boruta_web/lib/boruta_web/controllers/oauth/authorize_controller.ex
index b4ec1ccd..d40f2c11 100644
--- a/apps/boruta_web/lib/boruta_web/controllers/oauth/authorize_controller.ex
+++ b/apps/boruta_web/lib/boruta_web/controllers/oauth/authorize_controller.ex
@@ -638,7 +638,7 @@ defmodule BorutaWeb.Oauth.AuthorizeController do
     current_user = current_user || %User{}
     anonymous_sub =  case conn.query_params["client_id"] do
       "did:" <> _key = did -> did
-      _ -> nil
+      client_id -> client_id
     end
     scope = case conn.query_params["scope"] do
       nil -> ""