diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestDraftingProcess.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestDraftingProcess.java
index 2d54afbf126..3a163907097 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestDraftingProcess.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestDraftingProcess.java
@@ -93,6 +93,8 @@ public class CEditorQuestDraftingProcess extends ACEditorBase<PaperCard, DeckGro
         catalogManager.setAlwaysNonUnique(true);
         deckManager.setAlwaysNonUnique(true);
 
+        getBtnAddBasicLands().setVisible(false);
+
         this.setCatalogManager(catalogManager);
         this.setDeckManager(deckManager);
     }
@@ -174,7 +176,8 @@ public class CEditorQuestDraftingProcess extends ACEditorBase<PaperCard, DeckGro
         // add sideboard to deck
         deck.getOrCreate(DeckSection.Sideboard).addAll(this.getDeckManager().getPool());
 
-        final String landSet = IBoosterDraft.LAND_SET_CODE[0].getCode();
+        // No need to add basic lands now that Add Basic Lands button exists
+        /*final String landSet = IBoosterDraft.LAND_SET_CODE[0].getCode();
         final boolean isZendikarSet = landSet.equals("ZEN"); // we want to generate one kind of Zendikar lands at a time only
         final boolean zendikarSetMode = MyRandom.getRandom().nextBoolean();
 
@@ -193,6 +196,7 @@ public class CEditorQuestDraftingProcess extends ACEditorBase<PaperCard, DeckGro
                 deck.get(DeckSection.Sideboard).add(landName, landSet, 30);
             }
         }
+        */
 
         return deck;
     } // getPlayersDeck()
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java
index dea10336830..ea5ddea9b9b 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java
@@ -302,8 +302,9 @@ public enum VSubmenuQuestPrefs implements IVSubmenu<CSubmenuQuestPrefs> {
         pnlDifficulty.add(new PrefInput(QPref.STARTING_CREDITS_HARD, QuestPreferencesErrType.DIFFICULTY), fieldConstraints);
         pnlDifficulty.add(new PrefInput(QPref.STARTING_CREDITS_EXPERT, QuestPreferencesErrType.DIFFICULTY), fieldConstraints);
 
-        pnlDifficulty.add(new FLabel.Builder().text("Starting Basic Lands").fontAlign(SwingConstants.RIGHT).build(), labelConstraints);
-        pnlDifficulty.add(new PrefInput(QPref.STARTING_BASIC_LANDS, QuestPreferencesErrType.DIFFICULTY), fieldConstraints + ", wrap");
+        // Basic lands are no longer generated for quest mode (we now use Add Basic Lands)
+        //pnlDifficulty.add(new FLabel.Builder().text("Starting Basic Lands").fontAlign(SwingConstants.RIGHT).build(), labelConstraints);
+        //pnlDifficulty.add(new PrefInput(QPref.STARTING_BASIC_LANDS, QuestPreferencesErrType.DIFFICULTY), fieldConstraints + ", wrap");
 
         pnlDifficulty.add(new FLabel.Builder().text("Wins for New Draft").fontAlign(SwingConstants.RIGHT).build(), labelConstraints);
         pnlDifficulty.add(new PrefInput(QPref.WINS_NEW_DRAFT, QuestPreferencesErrType.DIFFICULTY), fieldConstraints + ", wrap");
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java
index e1e7e038983..1faa00a7ce7 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java
@@ -90,7 +90,7 @@ public class QuestPrefsScreen extends FScreen {
 
         //Difficulty Adjustments (All)
         scroller.add(new PrefsHeader("Difficulty Adjustments (All)", FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_ALL));
-        scroller.add(new PrefsOption("Starting basic lands", QPref.STARTING_BASIC_LANDS, PrefsGroup.DIFFICULTY_ALL));
+        //scroller.add(new PrefsOption("Starting basic lands", QPref.STARTING_BASIC_LANDS, PrefsGroup.DIFFICULTY_ALL)); // Add Basic Lands is used instead
         scroller.add(new PrefsOption("Starting snow lands", QPref.STARTING_SNOW_LANDS, PrefsGroup.DIFFICULTY_ALL));
         scroller.add(new PrefsOption("Color bias (1-100%)", QPref.STARTING_POOL_COLOR_BIAS, PrefsGroup.DIFFICULTY_ALL));
         scroller.add(new PrefsOption("Penalty for loss", QPref.PENALTY_LOSS, PrefsGroup.DIFFICULTY_ALL));
diff --git a/forge-gui/src/main/java/forge/quest/QuestUtilCards.java b/forge-gui/src/main/java/forge/quest/QuestUtilCards.java
index fd78d42fab0..c8adc360bad 100644
--- a/forge-gui/src/main/java/forge/quest/QuestUtilCards.java
+++ b/forge-gui/src/main/java/forge/quest/QuestUtilCards.java
@@ -710,7 +710,8 @@ public final class QuestUtilCards {
         if (qc.getFormat() != null && !qc.getFormat().hasSnowLands()) {
             numberSnowLands = 0;
         }
-        this.qa.getShopList().addAll(QuestUtilCards.generateBasicLands(10, numberSnowLands, qc.getFormat()));
+        // Spell shop no longer sells basic lands (we use "Add Basic Lands" instead)
+        this.qa.getShopList().addAll(QuestUtilCards.generateBasicLands(/*10*/0, numberSnowLands, qc.getFormat()));
     }
 
     /**
diff --git a/forge-gui/src/main/java/forge/quest/data/QuestAssets.java b/forge-gui/src/main/java/forge/quest/data/QuestAssets.java
index 8b968cf8696..d1a657c0a9c 100644
--- a/forge-gui/src/main/java/forge/quest/data/QuestAssets.java
+++ b/forge-gui/src/main/java/forge/quest/data/QuestAssets.java
@@ -177,8 +177,9 @@ public class QuestAssets {
         if (useFormat != null && !useFormat.hasSnowLands()) {
             snowLands = 0;
         }
+        // Non-snow basic lands are no longer generated (we use Add Basic Lands)
         final ItemPool<PaperCard> lands = QuestUtilCards.generateBasicLands(
-                prefs.getPrefInt(QPref.STARTING_BASIC_LANDS), snowLands, useFormat);
+                /*prefs.getPrefInt(QPref.STARTING_BASIC_LANDS)*/0,  snowLands, useFormat);
         this.getCardPool().addAll(lands);
     }
 
diff --git a/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java b/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java
index 150a67d8b15..1137bae7277 100644
--- a/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java
+++ b/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java
@@ -70,7 +70,7 @@ public class QuestPreferences extends PreferencesStore<QuestPreferences.QPref> i
         REWARDS_TURN1("1500"),
 
         // How many basic your starting pool has (if appropriate)
-        STARTING_BASIC_LANDS("20"),
+        //STARTING_BASIC_LANDS("20"),
         STARTING_SNOW_LANDS("5"),
 
         // Starting pool color bias effect