diff --git a/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd b/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd
index b90d8f9c..cc0dc1ac 100644
--- a/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd
+++ b/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd
@@ -286,8 +286,8 @@ func _activate(
 									escoria.event_manager,
 									"event_finished"
 								)
-							if event_returned[0] == ESCExecution.RC_OK:
-								escoria.action_manager.clear_current_action()
+
+							clear_current_action()
 							emit_signal("action_finished")
 							return event_returned[0]
 						elif combine_with.events.has(combine_with_event)\
@@ -306,8 +306,8 @@ func _activate(
 									escoria.event_manager,
 									"event_finished"
 								)
-							if event_returned[0] == ESCExecution.RC_OK:
-								escoria.action_manager.clear_current_action()
+
+							clear_current_action()
 							emit_signal("action_finished")
 							return event_returned[0]
 						else:
@@ -327,6 +327,8 @@ func _activate(
 								self,
 								"Invalid action" + str(errors)
 							)
+
+							clear_current_action()
 							emit_signal("action_finished")
 							return ESCExecution.RC_ERROR
 					else:
@@ -342,6 +344,8 @@ func _activate(
 									combine_with.global_id
 								]
 						)
+
+						clear_current_action()
 						emit_signal("action_finished")
 						return ESCExecution.RC_ERROR
 				else:
@@ -374,8 +378,7 @@ func _activate(
 				escoria.event_manager,
 				"event_finished"
 			)
-		if event_returned[0] == ESCExecution.RC_OK:
-			clear_current_action()
+		clear_current_action()
 		emit_signal("action_finished")
 		return event_returned[0]
 	else:
@@ -387,6 +390,7 @@ func _activate(
 					target.global_id
 				]
 		)
+		clear_current_action()
 		emit_signal("action_finished")
 		return ESCExecution.RC_ERROR