diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py
index 4cc427cc9a4..85a12f70f58 100644
--- a/litellm/proxy/proxy_server.py
+++ b/litellm/proxy/proxy_server.py
@@ -7128,7 +7128,13 @@ async def chat_completion(  # noqa: PLR0915
             and user_api_key_dict.org_id is not None
         ):
             data["metadata"]["user_api_key_org_id"] = user_api_key_dict.org_id
-        data["metadata"]["user_api_key_org_alias"] = user_api_key_dict.organization_alias
+        if (
+            hasattr(user_api_key_dict, "organization_alias")
+            and user_api_key_dict.organization_alias is not None
+        ):
+            data["metadata"]["user_api_key_org_alias"] = (
+                user_api_key_dict.organization_alias
+            )
         if (
             hasattr(user_api_key_dict, "agent_id")
             and user_api_key_dict.agent_id is not None
@@ -7303,7 +7309,13 @@ async def completion(  # noqa: PLR0915
                 and user_api_key_dict.org_id is not None
             ):
                 data["metadata"]["user_api_key_org_id"] = user_api_key_dict.org_id
-            data["metadata"]["user_api_key_org_alias"] = user_api_key_dict.organization_alias
+            if (
+                hasattr(user_api_key_dict, "organization_alias")
+                and user_api_key_dict.organization_alias is not None
+            ):
+                data["metadata"]["user_api_key_org_alias"] = (
+                    user_api_key_dict.organization_alias
+                )
             if (
                 hasattr(user_api_key_dict, "agent_id")
                 and user_api_key_dict.agent_id is not None
@@ -7546,7 +7558,13 @@ async def embeddings(  # noqa: PLR0915
                 and user_api_key_dict.org_id is not None
             ):
                 data["metadata"]["user_api_key_org_id"] = user_api_key_dict.org_id
-            data["metadata"]["user_api_key_org_alias"] = user_api_key_dict.organization_alias
+            if (
+                hasattr(user_api_key_dict, "organization_alias")
+                and user_api_key_dict.organization_alias is not None
+            ):
+                data["metadata"]["user_api_key_org_alias"] = (
+                    user_api_key_dict.organization_alias
+                )
             if (
                 hasattr(user_api_key_dict, "agent_id")
                 and user_api_key_dict.agent_id is not None
diff --git a/tests/enterprise/litellm_enterprise/enterprise_callbacks/test_prometheus_logging_callbacks.py b/tests/enterprise/litellm_enterprise/enterprise_callbacks/test_prometheus_logging_callbacks.py
index 967ef2a5fec..f1835719b79 100644
--- a/tests/enterprise/litellm_enterprise/enterprise_callbacks/test_prometheus_logging_callbacks.py
+++ b/tests/enterprise/litellm_enterprise/enterprise_callbacks/test_prometheus_logging_callbacks.py
@@ -758,6 +758,8 @@ async def test_async_post_call_failure_hook(prometheus_logger):
         api_key_alias="test_alias",
         team="test_team",
         team_alias="test_team_alias",
+        org_id=None,
+        org_alias=None,
         requested_model="gpt-3.5-turbo",
         exception_status="429",
         exception_class="Openai.RateLimitError",
@@ -776,6 +778,8 @@ async def test_async_post_call_failure_hook(prometheus_logger):
         requested_model="gpt-3.5-turbo",
         team="test_team",
         team_alias="test_team_alias",
+        org_id=None,
+        org_alias=None,
         user="test_user",
         status_code="429",
         user_email=None,