diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java b/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java
index 39db1ca1254..2622270b862 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java
@@ -137,7 +137,9 @@ class AthreosGodOfPassageReturnEffect extends OneShotEffect<AthreosGodOfPassageR
                     }            
                 }
                 if (opponent == null || !paid) {
-                    controller.moveCardToHandWithInfo(creature, source.getSourceId(), game, null);
+                    if (game.getState().getZone(creature.getId()).equals(Zone.GRAVEYARD)) {
+                        controller.moveCardToHandWithInfo(creature, source.getSourceId(), game, Zone.GRAVEYARD);
+                    }
                 }                
             }
             return true;