diff --git a/src/engine/net/client/handlers/AttackCmdMsgHandler.java b/src/engine/net/client/handlers/AttackCmdMsgHandler.java
index a7a538a7..7676ee6e 100644
--- a/src/engine/net/client/handlers/AttackCmdMsgHandler.java
+++ b/src/engine/net/client/handlers/AttackCmdMsgHandler.java
@@ -68,7 +68,7 @@ public class AttackCmdMsgHandler extends AbstractClientMsgHandler {
             return true; // cannot attack a null target
         }
 
-        if (playerCharacter.getCombatTarget().equals(target))
+        if (playerCharacter.isCombat() && playerCharacter.getCombatTarget().equals(target))
             return true;
 
         //set sources target