diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/character.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/character.lua
index 581bbef..0abc3ce 100644
--- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/character.lua
+++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/character.lua
@@ -109,6 +109,7 @@ function HeroFighter:goBackToMenu()
 end
 
 function HeroFighter:finishAction()
+  self.action = nil
   self:setInactive()
 end
 
diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/actions/parent.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/actions/parent.lua
index b21080f..d1f6c5f 100644
--- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/actions/parent.lua
+++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/actions/parent.lua
@@ -40,6 +40,7 @@ function ActionParent:start()
 end
 
 function ActionParent:choregraphyEnded()
+  self.choregraphy = nil
   self:finishAction()
 end