diff --git a/Packages/nadena.dev.modular-avatar/Editor/ApplyOnPlay.cs b/Packages/nadena.dev.modular-avatar/Editor/ApplyOnPlay.cs
index 81737ddd..37059fda 100644
--- a/Packages/nadena.dev.modular-avatar/Editor/ApplyOnPlay.cs
+++ b/Packages/nadena.dev.modular-avatar/Editor/ApplyOnPlay.cs
@@ -74,6 +74,10 @@ namespace nadena.dev.modular_avatar.core.editor
             {
                 armedSource = RuntimeUtil.OnDemandSource.Start;
             }
+            else if (obj == PlayModeStateChange.EnteredEditMode)
+            {
+                armedSource = RuntimeUtil.OnDemandSource.Awake;
+            }
         }
     }
-}
\ No newline at end of file
+}