diff --git a/.pick_status.json b/.pick_status.json
index 233891c9db4..6368d50d358 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3134,7 +3134,7 @@
         "description": "tu/u_trace: Fix explicit toggle_name not being used",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "889f71f71a709a6b871715f5cab7947ce220685e",
         "notes": null
diff --git a/src/freedreno/vulkan/tu_tracepoints.py b/src/freedreno/vulkan/tu_tracepoints.py
index 8caab9068fa..3155977415c 100644
--- a/src/freedreno/vulkan/tu_tracepoints.py
+++ b/src/freedreno/vulkan/tu_tracepoints.py
@@ -60,8 +60,8 @@ def begin_end_tp(name, args=[], tp_struct=None, tp_print=None,
     if not toggle_name:
         toggle_name = name
 
-    if tp_default_enabled:
-        tu_default_tps.append(name)
+    if tp_default_enabled and toggle_name not in tu_default_tps:
+        tu_default_tps.append(toggle_name)
 
     # Make all the GPU render stage events take a cmdbuf, so that the
     # command_buffer field can be set appropriately in the UI.
@@ -69,14 +69,14 @@ def begin_end_tp(name, args=[], tp_struct=None, tp_print=None,
     args = [command_buffer_arg] + (args if args else [])
 
     Tracepoint('start_{0}'.format(name),
-               toggle_name=name,
+               toggle_name=toggle_name,
                args=args,
                tp_struct=tp_struct,
                tp_perfetto='tu_perfetto_start_{0}'.format(name) if queue_tp else None,
                tp_print=tp_print if queue_tp else None,
                tp_markers='tu_cs_trace_start' if marker_tp else None)
     Tracepoint('end_{0}'.format(name),
-               toggle_name=name,
+               toggle_name=toggle_name,
                args=end_args,
                tp_struct=end_tp_struct,
                tp_perfetto='tu_perfetto_end_{0}'.format(name),