diff --git a/Mage/src/mage/cards/CardImpl.java b/Mage/src/mage/cards/CardImpl.java
index 0ce555514f..ab070cfe7c 100644
--- a/Mage/src/mage/cards/CardImpl.java
+++ b/Mage/src/mage/cards/CardImpl.java
@@ -662,7 +662,11 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
         if (info == null) {
             info = new HashMap<>();
         }
-        info.put(key, value);
+        if (value == null || value.isEmpty()) {
+            info.remove(key);
+        } else {
+            info.put(key, value);
+        }
     }
 
     @Override