diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
index 8ed3b3d5e3b..64418e03f7c 100644
--- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
@@ -217,11 +217,13 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
         if (target instanceof TargetCardInHand) {
             List<Card> cards = new ArrayList<Card>();
             cards.addAll(this.hand.getCards(game));
-            Card pick = pickTarget(cards, outcome, target, null, game);
-            if (pick != null) {
-                target.add(pick.getId(), game);
-                return true;
+            while(!target.isChosen() && !cards.isEmpty()) {
+                Card pick = pickTarget(cards, outcome, target, null, game);
+                if (pick != null) {
+                    target.addTarget(pick.getId(), null, game);
+                }
             }
+            return target.isChosen();
         }
         if (target instanceof TargetCreatureOrPlayer) {
             List<Permanent> targets;