diff --git a/scripts/commands/duel.py b/scripts/commands/duel.py
index 4ce25bdf..cd26b240 100644
--- a/scripts/commands/duel.py
+++ b/scripts/commands/duel.py
@@ -22,6 +22,7 @@ def run(core, actor, target, commandString):
 		
 	if actor.getDuelList().contains(target):
 		actor.sendSystemMessage('You already challenged ' + target.getCustomName() + ' to a duel.', 0)
+		return
 
 	combatSvc.handleDuel(actor, target)
 		
diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java
index 01f73d43..3a3d8ddb 100644
--- a/src/services/combat/CombatService.java
+++ b/src/services/combat/CombatService.java
@@ -504,10 +504,10 @@ public class CombatService implements INetworkDispatch {
 		if(attacker.getAttachment("AI") instanceof AIActor && target instanceof CreatureObject) {
 			((AIActor) attacker.getAttachment("AI")).addDefender((CreatureObject) target);
 		} else {
-			attacker.addDefender(target);
+			attacker.addDefender(target); // See below comment
 		}
 
-		attacker.addDefender(target);
+		//attacker.addDefender(target); // Why do we need to add target to defender list twice?
 		
 		return true;