diff --git a/src/document/scene-document-validation.ts b/src/document/scene-document-validation.ts
index 9d555e17..5b5db927 100644
--- a/src/document/scene-document-validation.ts
+++ b/src/document/scene-document-validation.ts
@@ -667,6 +667,12 @@ function validateModelInstance(modelInstance: ModelInstance, path: string, docum
   }
 }
 
+function validateEntityName(name: string | undefined, path: string, diagnostics: SceneDiagnostic[]) {
+  if (name !== undefined && name.trim().length === 0) {
+    diagnostics.push(createDiagnostic("error", "invalid-entity-name", "Entity names must be non-empty when authored.", `${path}.name`));
+  }
+}
+
 function validatePlayerStartEntity(entity: PlayerStartEntity, path: string, diagnostics: SceneDiagnostic[]) {
   if (!isFiniteVec3(entity.position)) {
     diagnostics.push(