diff --git a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
index 50661fdb2da..0383db5c1a1 100644
--- a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
+++ b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
@@ -1168,7 +1168,9 @@ public class ChangeZoneAi extends SpellAbilityAi {
         if (searchedLibrary && ai.equals(player)) {
             ai.incLibrarySearched();
         }
-
+        if (sa.hasParam("NoShuffle")) {
+            shuffleMandatory = false;
+        }
         final ZoneType destination = ZoneType.smartValueOf(sa.getParam("Destination"));
         final List<Card> fetched = new ArrayList<Card>();
         final boolean remember = sa.hasParam("RememberChanged");
diff --git a/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java b/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
index 9bf92c3660d..ff109ed4bfc 100644
--- a/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
+++ b/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
@@ -705,6 +705,10 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
             decider.incLibrarySearched();
         }
 
+        if (sa.hasParam("NoShuffle")) {
+            shuffleMandatory = false;
+        }
+
         if (!defined) {
             if (origin.contains(ZoneType.Library) && !defined && !sa.hasParam("NoLooking") && !decider.hasKeyword("CantSearchLibrary")) {
                 final int fetchNum = Math.min(player.getCardsIn(ZoneType.Library).size(), 4);