diff --git a/forge-gui/res/cardsfolder/upcoming/thunderwave.txt b/forge-gui/res/cardsfolder/upcoming/thunderwave.txt
index 13acb9e7502..4224cfd3b02 100644
--- a/forge-gui/res/cardsfolder/upcoming/thunderwave.txt
+++ b/forge-gui/res/cardsfolder/upcoming/thunderwave.txt
@@ -3,8 +3,7 @@ ManaCost:2 R R
 Types:Sorcery
 A:SP$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:DBSDamage,10-19:DBChooseCard,20:DBLDamage | SpellDescription$ Roll a d20.
 SVar:DBSDamage:DB$ DamageAll | ValidCards$ Creature | NumDmg$ 3 | SpellDescription$ 1—9 VERT CARDNAME deals 3 damage to each creature.
-SVar:DBChooseCard:DB$ ChooseCard | Chooser$ You | Choices$ Creature | ChoiceTitle$ You may choose a creature | ChoiceOptional$ True | RememberChosen$ True | SubAbility$ DBMDamage
-SVar:DBMDamage:DB$ DamageAll | NumDmg$ 3 | ValidCards$ Creature.IsNotRemembered | SubAbility$ DBCleanup | SpellDescription$ 10—19 VERT You may choose a creature. CARDNAME deals 3 damage to each creature not chosen this way.
+SVar:DBChooseCard:DB$ ChooseCard | Chooser$ You | Choices$ Creature | ChoiceTitle$ You may choose a creature | ChoiceOptional$ True | SubAbility$ DBMDamage
+SVar:DBMDamage:DB$ DamageAll | NumDmg$ 3 | ValidCards$ Creature.nonChosenCard | SpellDescription$ 10—19 VERT You may choose a creature. CARDNAME deals 3 damage to each creature not chosen this way.
 SVar:DBLDamage:DB$ DamageAll | ValidCards$ Creature.OppCtrl | NumDmg$ 6 | SpellDescription$ 20 VERT CARDNAME deals 6 damage to each creature your opponents control.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
 Oracle:Roll a d20.\n1—9 | Thunderwave deals 3 damage to each creature.\n10—19 | You may choose a creature. Thunderwave deals 3 damage to each creature not chosen this way.\n20 | Thunderwave deals 6 damage to each creature your opponents control.