diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 8e1fcf1f..6d105100 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -1288,10 +1288,18 @@ void Creature::CancelAction()
                 hum->CancelAction();
             }
         }
+#if 1
+        RemoveBuffByEffectId(kBET_InRescue);
+#else
         RemoveBuffByEffectId(kBET_Rescuer);
+#endif
     }
     if (action_type == AT_Rescue) {
+#if 1
+        RemoveBuffByEffectId(kBET_Rescuer);
+#else
         RemoveBuffByEffectId(kBET_InRescue);
+#endif
     }
     if (action_type == AT_Reload) {
         GetTrigger()->EndReload();