diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java b/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java
index 2b251929cb1..386d42a91d9 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java
@@ -110,7 +110,9 @@ class TwilightShepherdEffect extends OneShotEffect<TwilightShepherdEffect> {
             Set<UUID> cardsInGraveyardId = watcher.getCardsPutToGraveyardFromBattlefield();
             for (UUID cardId : cardsInGraveyardId) {
                 Card card = game.getCard(cardId);
-                if (card != null && card.getOwnerId().equals(source.getControllerId())) {
+                if (card != null 
+                        && card.getOwnerId().equals(source.getControllerId())
+                        && game.getState().getZone(card.getId()).match(Zone.GRAVEYARD)) {
                     applied = card.moveToZone(Zone.HAND, source.getSourceId(), game, false);
                 }
             }