diff --git a/packages/editor/src/components/element/PropertiesPanelContainer.tsx b/packages/editor/src/components/element/PropertiesPanelContainer.tsx
index 1607ed3db5..3d29a04b5c 100755
--- a/packages/editor/src/components/element/PropertiesPanelContainer.tsx
+++ b/packages/editor/src/components/element/PropertiesPanelContainer.tsx
@@ -27,7 +27,7 @@ import { Popover } from '@mui/material'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { EntityUUID, UUIDComponent } from '@etherealengine/ecs'
+import { EntityUUID, UUIDComponent, entityExists } from '@etherealengine/ecs'
 import { Component, ComponentJSONIDMap, useOptionalComponent } from '@etherealengine/ecs/src/ComponentFunctions'
 import { MaterialSelectionState } from '@etherealengine/engine/src/scene/materials/MaterialLibraryState'
 import { NO_PROXY, getMutableState, getState, useHookstate } from '@etherealengine/hyperflux'
@@ -122,6 +122,8 @@ export const PropertiesPanelContainer = () => {
   const multiEdit = selectedEntities.length > 1
   const uuid = lockedNode.value ? lockedNode.value : selectedEntities[selectedEntities.length - 1]
 
+  const entity = UUIDComponent.useEntityByUUID(uuid)
+
   const { t } = useTranslation()
   const materialUUID = useHookstate(getMutableState(MaterialSelectionState).selectedMaterial).value
 
@@ -134,7 +136,7 @@ export const PropertiesPanelContainer = () => {
     >
       {materialUUID ? (
         <MaterialEditor materialUUID={materialUUID} />
-      ) : uuid ? (
+      ) : uuid && entity && entityExists(entity) ? (
         <EntityEditor entityUUID={uuid} key={uuid} multiEdit={multiEdit} />
       ) : (
         <div
diff --git a/packages/engine/src/scene/components/ModelComponent.tsx b/packages/engine/src/scene/components/ModelComponent.tsx
index 90402ac090..4de0c44e4e 100644
--- a/packages/engine/src/scene/components/ModelComponent.tsx
+++ b/packages/engine/src/scene/components/ModelComponent.tsx
@@ -43,6 +43,7 @@ import { GroupComponent, addObjectToGroup } from '@etherealengine/spatial/src/re
 import { MeshComponent } from '@etherealengine/spatial/src/renderer/components/MeshComponent'
 import {
   EntityTreeComponent,
+  iterateEntityNode,
   removeEntityNodeRecursively
 } from '@etherealengine/spatial/src/transform/components/EntityTree'
 import { VRM } from '@pixiv/three-vrm'
@@ -233,6 +234,9 @@ function ModelReactor() {
     if (!parentEntity) return
     const parentUUID = getComponent(parentEntity, UUIDComponent)
     const parentSource = getComponent(parentEntity, SourceComponent)
+    iterateEntityNode(entity, (entity) => {
+      setComponent(entity, SourceComponent, parentSource)
+    })
     GLTFSnapshotState.injectSnapshot(modelUUID, sourceID, parentUUID, parentSource)
   }, [modelComponent.dereference, gltfDocumentState[modelSceneID]])