diff --git a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java
index c579a8b7808..1ba8cc91805 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java
@@ -178,8 +178,13 @@ public class CardDetailPanel extends SkinnedPanel {
         setInfoLabel.setBorder(null);
         cdArea.setText("");
 
+        if (card == null) {
+            updateBorder(null, false);
+            return;
+        }
+
         final CardStateView state = card.getState(isInAltState);
-        if (card == null || state == null) {
+        if (state == null) {
             updateBorder(null, false);
             return;
         }