diff --git a/changelog.md b/changelog.md
index 2ae0b56a..7c501e91 100644
--- a/changelog.md
+++ b/changelog.md
@@ -25,6 +25,7 @@
 * **[UI]** Fixed and added many missing ground units icons
 * **[UI]** Ship groups could be replaced by SAM sites in the UI, which would lead to broken mission being generated - fixed 
 * **[New Game Wizard]** Removed the "mid game" campaign generator option which is currently broken
+* **[Mission Generator]** Empty navy groups will no longer be generated
 
 # 2.3.2
 
diff --git a/gen/fleet/cn_dd_group.py b/gen/fleet/cn_dd_group.py
index c2b51c88..a8fbdc44 100644
--- a/gen/fleet/cn_dd_group.py
+++ b/gen/fleet/cn_dd_group.py
@@ -32,6 +32,9 @@ class ChineseNavyGroupGenerator(ShipGroupGenerator):
         else:
             include_cc = False
 
+        if not any([include_frigate, include_dd, include_cc]):
+            include_frigate = True
+
         if include_frigate:
             self.add_unit(Type_054A_Frigate, "FF1", self.position.x + 1200, self.position.y + 900, self.heading)
             self.add_unit(Type_054A_Frigate, "FF2", self.position.x + 1200, self.position.y - 900, self.heading)
diff --git a/gen/fleet/ru_dd_group.py b/gen/fleet/ru_dd_group.py
index 69d0af57..d67656a7 100644
--- a/gen/fleet/ru_dd_group.py
+++ b/gen/fleet/ru_dd_group.py
@@ -35,6 +35,9 @@ class RussianNavyGroupGenerator(ShipGroupGenerator):
         else:
             include_cc = False
 
+        if not any([include_frigate, include_dd, include_cc]):
+            include_frigate = True
+
         if include_frigate:
             frigate_type = random.choice([FFL_1124_4_Grisha, FSG_1241_1MP_Molniya])
             self.add_unit(frigate_type, "FF1", self.position.x + 1200, self.position.y + 900, self.heading)