diff --git a/Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs b/Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs
index 000209bc..86de8bba 100644
--- a/Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs
+++ b/Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs
@@ -119,6 +119,7 @@ namespace nadena.dev.modular_avatar.core.editor
         {
             BoneDatabase.ResetBones();
             PathMappings.Clear();
+            ClonedMenuMappings.Clear();
 
             try
             {
@@ -159,6 +160,7 @@ namespace nadena.dev.modular_avatar.core.editor
                 {
                     UnityEngine.Object.DestroyImmediate(component);
                 }
+                ClonedMenuMappings.Clear();
             }
 
             FixupAnimatorDebugData(avatarGameObject);
diff --git a/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs b/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs
index 94ecab72..e22d3a07 100644
--- a/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs
+++ b/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs
@@ -192,6 +192,7 @@ namespace nadena.dev.modular_avatar.core.editor
                 newMenu = Object.Instantiate(menu);
                 AssetDatabase.CreateAsset(newMenu, Util.GenerateAssetPath());
                 remapped[menu] = newMenu;
+                ClonedMenuMappings.Add(menu, newMenu);
 
                 foreach (var control in newMenu.controls)
                 {