diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
index 2451d6780c3..b005cfa313d 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -743,7 +743,7 @@ public final class GamePanel extends javax.swing.JPanel {
 
     private void hideAll() {
         ActionCallback callback = Plugins.getInstance().getActionCallback();
-        ((MageActionCallback)callback).hideAll(gameId);
+        ((MageActionCallback)callback).hideGameUpdate(gameId);
     }
 
     private ShowCardsDialog showCards(String title, CardsView cards, boolean required, Map<String, Serializable> options) {
diff --git a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
index 709afd22be2..05c72c82bbf 100644
--- a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
+++ b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
@@ -345,6 +345,13 @@ public class MageActionCallback implements ActionCallback {
         }
     }
 
+    public void hideGameUpdate(UUID gameId) {
+        ArrowBuilder.getBuilder().removeArrowsByType(gameId, ArrowBuilder.Type.TARGET);
+        ArrowBuilder.getBuilder().removeArrowsByType(gameId, ArrowBuilder.Type.PAIRED);
+        ArrowBuilder.getBuilder().removeArrowsByType(gameId, ArrowBuilder.Type.SOURCE);
+        ArrowBuilder.getBuilder().removeArrowsByType(gameId, ArrowBuilder.Type.ENCHANT_PLAYERS);
+    }
+
     public void hideAll(UUID gameId) {
         hidePopup();
         startHideTimeout();