diff --git a/src/main/java/forge/card/ability/effects/ChooseTypeEffect.java b/src/main/java/forge/card/ability/effects/ChooseTypeEffect.java
index 7bdccd516b3..72cd09f3c13 100644
--- a/src/main/java/forge/card/ability/effects/ChooseTypeEffect.java
+++ b/src/main/java/forge/card/ability/effects/ChooseTypeEffect.java
@@ -87,15 +87,7 @@ public class ChooseTypeEffect extends SpellAbilityEffect {
                             for (final String s : invalidTypes) {
                                 validChoices.remove(s);
                             }
-                            final Object o = GuiChoose.one("Choose a creature type", validChoices);
-                            if (null == o) {
-                                return;
-                            }
-                            final String choice = (String) o;
-                            if (CardType.isACreatureType(choice) && !invalidTypes.contains(choice)) {
-                                valid = true;
-                                card.setChosenType(choice);
-                            }
+                            chosenType = GuiChoose.one("Choose a creature type", validChoices);
                         } else {
                             Player ai = sa.getActivatingPlayer();
                             Player opp = ai.getOpponent();