diff --git a/MekHQ/data/scenariotemplates/Deep Raid Defense.xml b/MekHQ/data/scenariotemplates/Deep Raid Defense.xml
index e8ea862b8a..2bf0491b17 100644
--- a/MekHQ/data/scenariotemplates/Deep Raid Defense.xml	
+++ b/MekHQ/data/scenariotemplates/Deep Raid Defense.xml	
@@ -201,7 +201,7 @@
                 <forceAlignment>1</forceAlignment>
                 <forceMultiplier>1.0</forceMultiplier>
                 <forceName>DropShip</forceName>
-                <generationMethod>3</generationMethod>
+                <generationMethod>4</generationMethod>
                 <generationOrder>1</generationOrder>
                 <maxWeightClass>4</maxWeightClass>
                 <minWeightClass>0</minWeightClass>
diff --git a/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml
index 8bf81ae95e..9c471ee198 100644
--- a/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml	
+++ b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml	
@@ -201,7 +201,7 @@
                 <forceAlignment>1</forceAlignment>
                 <forceMultiplier>1.0</forceMultiplier>
                 <forceName>DropShip</forceName>
-                <generationMethod>3</generationMethod>
+                <generationMethod>4</generationMethod>
                 <generationOrder>3</generationOrder>
                 <maxWeightClass>4</maxWeightClass>
                 <minWeightClass>0</minWeightClass>
diff --git a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml
index 8d2cb142a3..fd561de952 100644
--- a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml	
+++ b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml	
@@ -188,7 +188,7 @@
                 <forceAlignment>1</forceAlignment>
                 <forceMultiplier>1.0</forceMultiplier>
                 <forceName>DropShip</forceName>
-                <generationMethod>3</generationMethod>
+                <generationMethod>4</generationMethod>
                 <generationOrder>4</generationOrder>
                 <maxWeightClass>4</maxWeightClass>
                 <minWeightClass>1</minWeightClass>
diff --git a/MekHQ/data/scenariotemplates/Space Blockade Run.xml b/MekHQ/data/scenariotemplates/Space Blockade Run.xml
index f944f29de4..58c9816f07 100644
--- a/MekHQ/data/scenariotemplates/Space Blockade Run.xml	
+++ b/MekHQ/data/scenariotemplates/Space Blockade Run.xml	
@@ -158,7 +158,7 @@
                 <forceAlignment>1</forceAlignment>
                 <forceMultiplier>1.0</forceMultiplier>
                 <forceName>DropShip</forceName>
-                <generationMethod>3</generationMethod>
+                <generationMethod>4</generationMethod>
                 <generationOrder>4</generationOrder>
                 <maxWeightClass>4</maxWeightClass>
                 <minWeightClass>1</minWeightClass>
diff --git a/MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java b/MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java
index 628f367427..a1b6ff1c53 100644
--- a/MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java
+++ b/MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java
@@ -305,6 +305,10 @@ private static void swapInPlayerUnits(StratconScenario scenario, Campaign campai
                 }
 
                 for (Unit unit : potentialUnits) {
+                    if ((sft.getAllowedUnitType() == 11) && (!campaign.getCampaignOptions().isUseDropShips())) {
+                        continue;
+                    }
+
                     // if it's the right type of unit and is around
                     if (forceCompositionMatchesDeclaredUnitType(unit.getEntity().getUnitType(),
                             sft.getAllowedUnitType(), false) &&