diff --git a/src/entities/entity-instances.ts b/src/entities/entity-instances.ts
index 22b89575..f021d709 100644
--- a/src/entities/entity-instances.ts
+++ b/src/entities/entity-instances.ts
@@ -201,6 +201,15 @@ function normalizeSoundEmitterAudioAssetId(audioAssetId: string | null | undefin
   return trimmedAudioAssetId;
 }
 
+export function normalizeEntityName(name: string | null | undefined): string | undefined {
+  if (name === undefined || name === null) {
+    return undefined;
+  }
+
+  const trimmedName = name.trim();
+  return trimmedName.length === 0 ? undefined : trimmedName;
+}
+
 export function normalizeYawDegrees(yawDegrees: number): number {
   const normalizedYaw = yawDegrees % 360;
   return normalizedYaw < 0 ? normalizedYaw + 360 : normalizedYaw;