diff --git a/src/engine/net/client/handlers/AttackCmdMsgHandler.java b/src/engine/net/client/handlers/AttackCmdMsgHandler.java
index 46c96f96..a7a538a7 100644
--- a/src/engine/net/client/handlers/AttackCmdMsgHandler.java
+++ b/src/engine/net/client/handlers/AttackCmdMsgHandler.java
@@ -67,6 +67,10 @@ public class AttackCmdMsgHandler extends AbstractClientMsgHandler {
             playerCharacter.setCombatTarget(null);
             return true; // cannot attack a null target
         }
+
+        if (playerCharacter.getCombatTarget().equals(target))
+            return true;
+
         //set sources target
 
         playerCharacter.setCombatTarget(target);