diff --git a/litellm/proxy/litellm_pre_call_utils.py b/litellm/proxy/litellm_pre_call_utils.py
index 66a6c74a1..24481e9c6 100644
--- a/litellm/proxy/litellm_pre_call_utils.py
+++ b/litellm/proxy/litellm_pre_call_utils.py
@@ -351,15 +351,8 @@ async def add_litellm_data_to_request(
 
     # Enterprise Only - Check if using tag based routing
     if llm_router and llm_router.enable_tag_filtering is True:
-        if premium_user is not True:
-            verbose_proxy_logger.warning(
-                "router.enable_tag_filtering is on %s \n switched off router.enable_tag_filtering",
-                CommonProxyErrors.not_premium_user.value,
-            )
-            llm_router.enable_tag_filtering = False
-        else:
-            if "tags" in data:
-                data[_metadata_variable_name]["tags"] = data["tags"]
+        if "tags" in data:
+            data[_metadata_variable_name]["tags"] = data["tags"]
 
     ### TEAM-SPECIFIC PARAMS ###
     if user_api_key_dict.team_id is not None:
diff --git a/litellm/proxy/management_endpoints/key_management_endpoints.py b/litellm/proxy/management_endpoints/key_management_endpoints.py
index 01bb5e090..dd5dc7377 100644
--- a/litellm/proxy/management_endpoints/key_management_endpoints.py
+++ b/litellm/proxy/management_endpoints/key_management_endpoints.py
@@ -207,6 +207,13 @@ async def generate_key_fn(
 
         # Set tags on the new key
         if "tags" in data_json:
+            from litellm.proxy.proxy_server import premium_user
+
+            if premium_user is not True:
+                raise ValueError(
+                    f"Only premium users can add tags to teams. {CommonProxyErrors.not_premium_user.value}"
+                )
+
             if data_json["metadata"] is None:
                 data_json["metadata"] = {"tags": data_json["tags"]}
             else:
diff --git a/litellm/proxy/management_endpoints/team_endpoints.py b/litellm/proxy/management_endpoints/team_endpoints.py
index 2fbf44fa3..2ba4da12f 100644
--- a/litellm/proxy/management_endpoints/team_endpoints.py
+++ b/litellm/proxy/management_endpoints/team_endpoints.py
@@ -232,6 +232,12 @@ async def new_team(
 
     # Set tags on the new team
     if data.tags is not None:
+        from litellm.proxy.proxy_server import premium_user
+
+        if premium_user is not True:
+            raise ValueError(
+                f"Only premium users can add tags to teams. {CommonProxyErrors.not_premium_user.value}"
+            )
         if complete_team_data.metadata is None:
             complete_team_data.metadata = {"tags": data.tags}
         else:
@@ -381,6 +387,12 @@ async def update_team(
 
     # check if user is trying to update tags for team
     if "tags" in updated_kv and updated_kv["tags"] is not None:
+        from litellm.proxy.proxy_server import premium_user
+
+        if premium_user is not True:
+            raise ValueError(
+                f"Only premium users can add tags to teams. {CommonProxyErrors.not_premium_user.value}"
+            )
         # remove tags from updated_kv
         _tags = updated_kv.pop("tags")
         if "metadata" in updated_kv and updated_kv["metadata"] is not None: