diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 0a5a151be4f..6c024b63aae 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -37,9 +37,7 @@ import forge.game.*;
 import forge.game.ability.AbilityFactory;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
-import forge.game.card.CardCollectionView;
 import forge.game.card.CardPredicates.Presets;
-import forge.game.card.CardView;
 import forge.game.combat.AttackingBand;
 import forge.game.combat.Combat;
 import forge.game.cost.Cost;
@@ -431,8 +429,10 @@ public class Card extends GameEntity implements Comparable<Card> {
         // Mark this card as "manifested"
         c.setManifested(true);
 
-        // Add manifest demorph static ability for creatures?
-        c.addSpellAbility(CardFactoryUtil.abilityManifestFaceUp(c, cost, isCreature));
+        // Add manifest demorph static ability for creatures
+        if (isCreature) {
+            c.addSpellAbility(CardFactoryUtil.abilityManifestFaceUp(c, cost));
+        }
 
         return c;
     }
diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index bd8826b816c..4ff8864f994 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -166,7 +166,7 @@ public class CardFactoryUtil {
         return morphUp;
     }
 
-    public static AbilityStatic abilityManifestFaceUp(final Card sourceCard, final ManaCost manaCost, final boolean canFlip) {
+    public static AbilityStatic abilityManifestFaceUp(final Card sourceCard, final ManaCost manaCost) {
         final Cost cost = new Cost(manaCost, false);
 
         final AbilityStatic manifestUp = new AbilityStatic(sourceCard, cost, null) {
@@ -183,7 +183,7 @@ public class CardFactoryUtil {
             @Override
             public boolean canPlay() {
                 return sourceCard.getController().equals(this.getActivatingPlayer()) && sourceCard.isFaceDown()
-                        && sourceCard.isInPlay() && sourceCard.isManifested() && canFlip;
+                        && sourceCard.isInPlay() && sourceCard.isManifested();
             }
 
         }; // manifest_up