diff --git a/tsl/profiler/lib/traceme.h b/tsl/profiler/lib/traceme.h
index b58c74b31..7c9a1f4ac 100644
--- a/tsl/profiler/lib/traceme.h
+++ b/tsl/profiler/lib/traceme.h
@@ -155,12 +155,6 @@ class TraceMe {
                          TraceMeRecorder::CheckFilter(filter_mask))) {
       name_.Emplace(std::forward<NameGeneratorT>(name_generator)());
       start_time_ = GetCurrentTimeNanos();
-    } else {
-#ifndef NDEBUG
-      // Always invoke the name generator on debug builds to catch bugs in name
-      // generators that would otherwise only be caught when tracing is enabled.
-      std::forward<NameGeneratorT>(name_generator)();
-#endif
     }
 #endif
   }
@@ -218,16 +212,12 @@ class TraceMe {
       std::enable_if_t<std::is_invocable_v<MetadataGeneratorT>, bool> = true>
   void AppendMetadata(MetadataGeneratorT&& metadata_generator) {
 #if !defined(IS_MOBILE_PLATFORM)
-    if (TF_PREDICT_FALSE(start_time_ != kUntracedActivity) &&
-        TF_PREDICT_TRUE(TraceMeRecorder::Active())) {
-      traceme_internal::AppendMetadata(
-          &name_.value, std::forward<MetadataGeneratorT>(metadata_generator)());
-    } else {
-#ifndef NDEBUG
-      // Always invoke the name generator on debug builds to catch bugs in name
-      // generators that would otherwise only be caught when tracing is enabled.
-      std::forward<MetadataGeneratorT>(metadata_generator)();
-#endif
+    if (TF_PREDICT_FALSE(start_time_ != kUntracedActivity)) {
+      if (TF_PREDICT_TRUE(TraceMeRecorder::Active())) {
+        traceme_internal::AppendMetadata(
+            &name_.value,
+            std::forward<MetadataGeneratorT>(metadata_generator)());
+      }
     }
 #endif
   }
@@ -249,12 +239,6 @@ class TraceMe {
       TraceMeRecorder::Record({std::forward<NameGeneratorT>(name_generator)(),
                                GetCurrentTimeNanos(), -activity_id});
       return activity_id;
-    } else {
-#ifndef NDEBUG
-      // Always invoke the name generator on debug builds to catch bugs in name
-      // generators that would otherwise only be caught when tracing is enabled.
-      std::forward<NameGeneratorT>(name_generator)();
-#endif
     }
 #endif
     return kUntracedActivity;
@@ -316,12 +300,6 @@ class TraceMe {
       int64_t now = GetCurrentTimeNanos();
       TraceMeRecorder::Record({std::forward<NameGeneratorT>(name_generator)(),
                                /*start_time=*/now, /*end_time=*/now});
-    } else {
-#ifndef NDEBUG
-      // Always invoke the name generator on debug builds to catch bugs in name
-      // generators that would otherwise only be caught when tracing is enabled.
-      std::forward<NameGeneratorT>(name_generator)();
-#endif
     }
 #endif
   }