diff --git a/Mage/src/mage/counters/Counters.java b/Mage/src/mage/counters/Counters.java
index 06319dee227..d842c335417 100644
--- a/Mage/src/mage/counters/Counters.java
+++ b/Mage/src/mage/counters/Counters.java
@@ -89,6 +89,9 @@ public class Counters extends HashMap<String, Counter> implements Serializable {
     public void removeCounter(String name, int amount) {
         if (this.containsKey(name)) {
             this.get(name).remove(amount);
+            if (this.get(name).getCount() == 0) {
+                this.remove(name);
+            }
         }
     }