diff --git a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java
index 55bdfd789e6..7607398cd73 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java
@@ -247,20 +247,7 @@ public final class AbilityFactory {
 
         if (mapParams.containsKey("SubAbility")) {
             final String name = mapParams.get("SubAbility");
-            SpellAbility p = parent;
-            AbilitySub sub = null;
-            while (p != null) {
-                sub = p.getAdditionalAbility(name);
-                if (sub != null) {
-                    break;
-                }
-                p = p.getParent();
-            }
-            if (sub == null) {
-                sub = getSubAbility(state, name, spellAbility);
-            }
-            spellAbility.setSubAbility(sub);
-            spellAbility.setAdditionalAbility(name, sub);            
+            spellAbility.setSubAbility(getSubAbility(state, name, spellAbility));
         }
 
         for (final String key : additionalAbilityKeys) {