diff --git a/ui/operator_ui/main.py b/ui/operator_ui/main.py
index 579f0e7d8..c34ffd4f2 100644
--- a/ui/operator_ui/main.py
+++ b/ui/operator_ui/main.py
@@ -961,11 +961,13 @@ def get_operator_get_logs(worker: int):
 @app.route('/operator/clusters/<namespace>/<cluster>/logs')
 @authorize
 def get_operator_get_logs_per_cluster(namespace: str, cluster: str):
+    team, cluster_name = cluster.split('-', 1)
+    # team id might contain hyphens, try to find correct team name
     user_teams = get_teams_for_user(session.get('user_name', ''))
     for user_team in user_teams:
-        if cluster.find(user_team) == 0:
+        if cluster.find(user_team + '-') == 0:
             team = cluster[:len(user_team)]
-            cluster_name = cluster[len(user_team)+1:]
+            cluster_name = cluster[len(user_team + '-'):]
             break
     return proxy_operator(f'/clusters/{team}/{namespace}/{cluster_name}/logs/')