diff --git a/GameServer/src/org/moparscape/msc/gs/model/Npc.java b/GameServer/src/org/moparscape/msc/gs/model/Npc.java
index 44588e7..6bd6131 100644
--- a/GameServer/src/org/moparscape/msc/gs/model/Npc.java
+++ b/GameServer/src/org/moparscape/msc/gs/model/Npc.java
@@ -578,13 +578,18 @@ public class Npc extends Mob {
 			Instance.getDelayedEventHandler().add(fighting);
 		}
 
-		if (now - lastMovement > 2200) {
-			lastMovement = now;
-			int rand = DataConversions.random(0, 1);
-			if (!isBusy() && finishedPath() && rand == 1 && !this.isRemoved()) {
-				int newX = DataConversions.random(loc.minX(), loc.maxX());
-				int newY = DataConversions.random(loc.minY(), loc.maxY());
-				super.setPath(new Path(getX(), getY(), newX, newY));
+		if (now - lastMovement > 1800) {
+			if (now - getCombatTimer() < (getCombatState() == 
+					CombatState.WAITING ? 5000 : 500)) {
+			}
+			else {
+				lastMovement = now;
+				int rand = DataConversions.random(0, 1);
+				if (!isBusy() && finishedPath() && rand == 1 && !this.isRemoved()) {
+					int newX = DataConversions.random(loc.minX(), loc.maxX());
+					int newY = DataConversions.random(loc.minY(), loc.maxY());
+					super.setPath(new Path(getX(), getY(), newX, newY));
+				}
 			}
 		}