diff --git a/project/src/services/LocationLifecycleService.ts b/project/src/services/LocationLifecycleService.ts
index 1d5ce6f1..988a0ca0 100644
--- a/project/src/services/LocationLifecycleService.ts
+++ b/project/src/services/LocationLifecycleService.ts
@@ -270,6 +270,12 @@ export class LocationLifecycleService {
             return locationBaseClone;
         }
 
+        // If new spawn system is enabled, clear the spawn waves
+        if (locationBaseClone.NewSpawn)
+        {
+            locationBaseClone.waves = [];
+        }
+
         // We only need the base data
         if (!generateLoot) {
             return locationBaseClone;
diff --git a/project/src/services/PostDbLoadService.ts b/project/src/services/PostDbLoadService.ts
index 0b81e4ca..15b5b038 100644
--- a/project/src/services/PostDbLoadService.ts
+++ b/project/src/services/PostDbLoadService.ts
@@ -296,6 +296,7 @@ export class PostDbLoadService {
             }
 
             map.base.BotMaxPvE = this.botConfig.maxBotCap[locationKey];
+            map.base.BotMax = this.botConfig.maxBotCap[locationKey];
 
             // make values no larger than 30 secs
             map.base.BotStart = Math.min(map.base.BotStart, 30);