diff --git a/backend/open_webui/utils/oauth.py b/backend/open_webui/utils/oauth.py
index 039e7cd4c9..f5b96e99d6 100644
--- a/backend/open_webui/utils/oauth.py
+++ b/backend/open_webui/utils/oauth.py
@@ -333,7 +333,10 @@ async def get_oauth_client_info_with_dynamic_client_registration(
 
                     # The mcp package requires optional unset values to be None. If an empty string is passed, it gets validated and fails.
                     # This replaces all empty strings with None.
-                    registration_response_json = {k: (None if v == "" else v) for k, v in registration_response_json.items()}
+                    registration_response_json = {
+                        k: (None if v == "" else v)
+                        for k, v in registration_response_json.items()
+                    }
                     oauth_client_info = OAuthClientInformationFull.model_validate(
                         {
                             **registration_response_json,
@@ -694,16 +697,17 @@ class OAuthClientManager:
         error_message = None
         try:
             client_info = self.get_client_info(client_id)
-            token_params = {}
+
+            auth_params = {}
             if (
                 client_info
                 and hasattr(client_info, "client_id")
                 and hasattr(client_info, "client_secret")
             ):
-                token_params["client_id"] = client_info.client_id
-                token_params["client_secret"] = client_info.client_secret
+                auth_params["client_id"] = client_info.client_id
+                auth_params["client_secret"] = client_info.client_secret
 
-            token = await client.authorize_access_token(request, **token_params)
+            token = await client.authorize_access_token(request, **auth_params)
             if token:
                 try:
                     # Add timestamp for tracking
@@ -1228,8 +1232,16 @@ class OAuthManager:
         error_message = None
         try:
             client = self.get_client(provider)
+
+            auth_params = {}
+            if client:
+                if hasattr(client, "client_id"):
+                    auth_params["client_id"] = client.client_id
+                if hasattr(client, "client_secret"):
+                    auth_params["client_secret"] = client.client_secret
+
             try:
-                token = await client.authorize_access_token(request)
+                token = await client.authorize_access_token(request, **auth_params)
             except Exception as e:
                 detailed_error = _build_oauth_callback_error_message(e)
                 log.warning(