diff --git a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
index 30b1728e46b..053f2c7c87a 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
@@ -229,7 +229,7 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener,
         // remove possible mouse listeners, preventing gc
         for (MageCard mageCard: cards.values()) {
             if (mageCard instanceof CardPanel) {
-                ((CardPanel)mageCard).clear();
+                ((CardPanel)mageCard).cleanUp();
             }
         }
         this.cards.clear();
diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
index 20647663875..0511421614e 100644
--- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
+++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
@@ -252,7 +252,7 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
         });
     }
 
-    public void clear() {
+    public void cleanUp() {
         if (dayNightButton != null) {
             for(ActionListener al: dayNightButton.getActionListeners()) {
                 dayNightButton.removeActionListener(al);
@@ -267,6 +267,7 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
         for(MouseWheelListener ml: this.getMouseWheelListeners() ){
             this.removeMouseWheelListener(ml);
         }
+        this.callback = null;
     }
 
     private void setText(CardView card) {