diff --git a/backend/open_webui/utils/headers.py b/backend/open_webui/utils/headers.py
index 00262df0f1..09d0683c9e 100644
--- a/backend/open_webui/utils/headers.py
+++ b/backend/open_webui/utils/headers.py
@@ -19,6 +19,7 @@ from open_webui.env import (
     FORWARD_USER_INFO_HEADER_USER_ROLE,
 )
 from open_webui.models.groups import Groups
+from open_webui.utils.oauth import get_system_oauth_token
 
 log = logging.getLogger(__name__)
 
@@ -208,16 +209,7 @@ async def get_headers_and_cookies(
     elif auth_type == 'session':
         token = request.state.token.credentials
     elif auth_type == 'system_oauth':
-        oauth_token = None
-        try:
-            if request.cookies.get('oauth_session_id', None):
-                oauth_token = await request.app.state.oauth_manager.get_oauth_token(
-                    user.id,
-                    request.cookies.get('oauth_session_id', None),
-                )
-        except Exception as e:
-            log.error(f'Error getting OAuth token: {e}')
-
+        oauth_token = await get_system_oauth_token(request, user) if user else None
         if oauth_token:
             token = f'{oauth_token.get("access_token", "")}'