diff --git a/GameServer/src/org/moparscape/msc/gs/event/FightEvent.java b/GameServer/src/org/moparscape/msc/gs/event/FightEvent.java
index 73271d1..1b5d230 100644
--- a/GameServer/src/org/moparscape/msc/gs/event/FightEvent.java
+++ b/GameServer/src/org/moparscape/msc/gs/event/FightEvent.java
@@ -60,14 +60,14 @@ public class FightEvent extends DelayedEvent {
 
 	public void run() {
 		if(owner == null || affectedMob == null) {
-		    return;
+			this.stop();
 		}
 		if (!owner.loggedIn()
 				|| (affectedMob instanceof Player && !((Player) affectedMob)
 						.loggedIn())) {
 			owner.resetCombat(CombatState.ERROR);
 			affectedMob.resetCombat(CombatState.ERROR);
-			return;
+			this.stop(); 
 		}
 
 		Mob attacker, opponent;