diff --git a/renderdoc/api/replay/data_types.h b/renderdoc/api/replay/data_types.h
index 945bdc8c6..112e70a66 100644
--- a/renderdoc/api/replay/data_types.h
+++ b/renderdoc/api/replay/data_types.h
@@ -267,10 +267,8 @@ typically it is one parent to many derived.
   DOCUMENT("Utility function for setting up a custom name to overwrite the auto-generated one.");
   inline void SetCustomName(const rdcstr &givenName)
   {
-    // consider an empty name to be un-setting any previous set name, and revert to the
-    // auto-generated name.
-    autogeneratedName = !givenName.isEmpty();
-    name = givenName;
+    autogeneratedName = false;
+    name = givenName.isEmpty() ? "<empty>" : givenName;
   }
 };