diff --git a/app/src/modules/builder/asset/models/model/model.tsx b/app/src/modules/builder/asset/models/model/model.tsx
index ff5e0bf..c7bca83 100644
--- a/app/src/modules/builder/asset/models/model/model.tsx
+++ b/app/src/modules/builder/asset/models/model/model.tsx
@@ -57,7 +57,7 @@ function Model({ asset }: { readonly asset: Asset }) {
 
     useEffect(() => {
         setDeletableFloorItem(null);
-        if (selectedFloorItem === null) {
+        if (selectedFloorItem === null || selectedFloorItem.modelUuid !== asset.modelUuid) {
             resetAnimation(asset.modelUuid);
         }
     }, [activeModule, toolMode, selectedFloorItem])
@@ -291,7 +291,7 @@ function Model({ asset }: { readonly asset: Asset }) {
 
     useFrame((_, delta) => {
         if (mixerRef.current) {
-            mixerRef.current.update(delta * speed);
+            mixerRef.current.update(delta * (activeModule === 'simulation' ? speed : 1));
         }
     });