diff --git a/code/datums/actions/action.dm b/code/datums/actions/action.dm
index 226749028721..f7ffab519a35 100644
--- a/code/datums/actions/action.dm
+++ b/code/datums/actions/action.dm
@@ -135,7 +135,8 @@
 
 	if(target == owner)
 		RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clear_ref))
-	owner = null
+	if(owner == remove_from)
+		owner = null
 
 /// Actually triggers the effects of the action.
 /// Called when the on-screen button is clicked, for example.