diff --git a/src/viewport-three/viewport-host.ts b/src/viewport-three/viewport-host.ts
index 088e11ad..b063205c 100644
--- a/src/viewport-three/viewport-host.ts
+++ b/src/viewport-three/viewport-host.ts
@@ -5694,6 +5694,7 @@ export class ViewportHost {
           case "pointLight":
           case "playerStart":
           case "sceneEntry":
+          case "npc":
           case "soundEmitter":
           case "teleportTarget":
           case "interactable":
@@ -5815,7 +5816,7 @@ export class ViewportHost {
       case "box-brush":
         return "box-brush";
       case "entity":
-        return `entity:${target.entityKind}:${target.audioAssetId}`;
+        return `entity:${target.entityKind}:${target.audioAssetId}:${target.modelAssetId}`;
       case "model-instance":
         return `model-instance:${target.assetId}`;
     }
@@ -5896,6 +5897,15 @@ export class ViewportHost {
               BOX_CREATE_PREVIEW_FILL
             ).group;
             break;
+          case "npc":
+            previewGroup = this.createNpcRenderObjects(
+              "creation-preview",
+              previewPosition,
+              DEFAULT_NPC_YAW_DEGREES,
+              false,
+              BOX_CREATE_PREVIEW_FILL
+            ).group;
+            break;
           case "soundEmitter":
             previewGroup = this.createSoundEmitterRenderObjects(
               "creation-preview",
@@ -6003,7 +6013,8 @@ export class ViewportHost {
                 ? {
                     kind: "entity",
                     entityKind: toolPreview.target.entityKind,
-                    audioAssetId: toolPreview.target.audioAssetId
+                    audioAssetId: toolPreview.target.audioAssetId,
+                    modelAssetId: toolPreview.target.modelAssetId
                   }
                 : toolPreview.target.kind === "model-instance"
                   ? {