diff --git a/Mage.Sets/src/mage/cards/t/ThousandFacedShadow.java b/Mage.Sets/src/mage/cards/t/ThousandFacedShadow.java
index 9187d0844db..0a1d59b6f67 100644
--- a/Mage.Sets/src/mage/cards/t/ThousandFacedShadow.java
+++ b/Mage.Sets/src/mage/cards/t/ThousandFacedShadow.java
@@ -87,10 +87,16 @@ class ThousandFacedShadowTriggeredAbility extends TriggeredAbilityImpl {
     public boolean checkTrigger(GameEvent event, Game game) {
         Permanent permanent = game.getPermanent(event.getTargetId());
         return permanent != null
-                && ((EntersTheBattlefieldEvent) event).getFromZone() == Zone.GRAVEYARD
+                && ((EntersTheBattlefieldEvent) event).getFromZone() == Zone.HAND
                 && permanent.getId().equals(getSourceId());
     }
 
+    @Override
+    public boolean checkInterveningIfClause(Game game) {
+        Permanent permanent = getSourcePermanentIfItStillExists(game);
+        return permanent != null && permanent.isAttacking();
+    }
+
     @Override
     public String getRule() {
         return "When {this} enters the battlefield from your hand, if it's attacking, " +