diff --git a/config-vanilla.json b/config-vanilla.json
index 4ecb5aec..2962ecee 100644
--- a/config-vanilla.json
+++ b/config-vanilla.json
@@ -19,8 +19,6 @@
   "unlockAllSkins": false,
   "unlockAllCapturaScenes": false,
   "fullyStockedVendors": false,
-  "baroAlwaysAvailable": false,
-  "baroFullyStocked": false,
   "unlockAllProfitTakerStages": false,
   "skipClanKeyCrafting": false,
   "noDojoRoomBuildStage": false,
@@ -45,6 +43,9 @@
     "affinityBoost": false,
     "resourceBoost": false,
     "tennoLiveRelay": false,
+    "baroTennoConRelay": false,
+    "baroAlwaysAvailable": false,
+    "baroFullyStocked": false,
     "wolfHunt": false,
     "orphixVenom": false,
     "longShadow": false,
diff --git a/src/services/configService.ts b/src/services/configService.ts
index dabb8af7..13b59f63 100644
--- a/src/services/configService.ts
+++ b/src/services/configService.ts
@@ -27,8 +27,6 @@ export interface IConfig extends IConfigRemovedOptions {
     unlockAllCapturaScenes?: boolean;
     unlockAllDecoRecipes?: boolean;
     fullyStockedVendors?: boolean;
-    baroAlwaysAvailable?: boolean;
-    baroFullyStocked?: boolean;
     unlockAllProfitTakerStages?: boolean;
     skipClanKeyCrafting?: boolean;
     noDojoRoomBuildStage?: boolean;
@@ -57,6 +55,8 @@ export interface IConfig extends IConfigRemovedOptions {
         resourceBoost?: boolean;
         tennoLiveRelay?: boolean;
         baroTennoConRelay?: boolean;
+        baroFullyStocked?: boolean;
+        baroAlwaysAvailable?: boolean;
         wolfHunt?: boolean;
         orphixVenom?: boolean;
         longShadow?: boolean;
@@ -120,7 +120,9 @@ export const configRemovedOptionsKeys = [
     "syndicateMissionsRepeatable",
     "instantFinishRivenChallenge",
     "instantResourceExtractorDrones",
-    "noResourceExtractorDronesDamage"
+    "noResourceExtractorDronesDamage",
+    "baroAlwaysAvailable",
+    "baroFullyStocked"
 ] as const;
 
 type IConfigRemovedOptions = {
diff --git a/src/services/inboxService.ts b/src/services/inboxService.ts
index f503fdd0..f6e2dfca 100644
--- a/src/services/inboxService.ts
+++ b/src/services/inboxService.ts
@@ -36,7 +36,7 @@ export const createNewEventMessages = async (req: Request): Promise<void> => {
     // Baro
     const baroIndex = Math.trunc((Date.now() - 910800000) / (unixTimesInMs.day * 14));
     const baroStart = baroIndex * (unixTimesInMs.day * 14) + 910800000;
-    const baroActualStart = baroStart + unixTimesInMs.day * (config.baroAlwaysAvailable ? 0 : 12);
+    const baroActualStart = baroStart + unixTimesInMs.day * (config.worldState?.baroAlwaysAvailable ? 0 : 12);
     if (Date.now() >= baroActualStart && account.LatestEventMessageDate.getTime() < baroActualStart) {
         newEventMessages.push({
             sndr: "/Lotus/Language/G1Quests/VoidTraderName",
diff --git a/src/services/worldStateService.ts b/src/services/worldStateService.ts
index d08c9c9b..ce0207f5 100644
--- a/src/services/worldStateService.ts
+++ b/src/services/worldStateService.ts
@@ -2933,7 +2933,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
     {
         const baroIndex = Math.trunc((Date.now() - 910800000) / (unixTimesInMs.day * 14));
         const baroStart = baroIndex * (unixTimesInMs.day * 14) + 910800000;
-        const baroActualStart = baroStart + unixTimesInMs.day * (config.baroAlwaysAvailable ? 0 : 12);
+        const baroActualStart = baroStart + unixTimesInMs.day * (config.worldState?.baroAlwaysAvailable ? 0 : 12);
         const baroEnd = baroStart + unixTimesInMs.day * 14;
         const baroNode = ["EarthHUB", "MercuryHUB", "SaturnHUB", "PlutoHUB"][baroIndex % 4];
         const vt: IVoidTrader = {
@@ -2946,7 +2946,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
         };
         worldState.VoidTraders.push(vt);
         if (isBeforeNextExpectedWorldStateRefresh(timeMs, baroActualStart)) {
-            if (config.baroFullyStocked) {
+            if (config.worldState?.baroFullyStocked) {
                 fullyStockBaro(vt);
             } else {
                 const rng = new SRng(new SRng(baroIndex).randomInt(0, 100_000));
diff --git a/static/webui/index.html b/static/webui/index.html
index 52e278f2..e6d0dcbd 100644
--- a/static/webui/index.html
+++ b/static/webui/index.html
@@ -822,14 +822,6 @@
                                         <input class="form-check-input" type="checkbox" id="fullyStockedVendors" />
                                         <label class="form-check-label" for="fullyStockedVendors" data-loc="cheats_fullyStockedVendors"></label>
                                     </div>
-                                    <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" id="baroAlwaysAvailable" />
-                                        <label class="form-check-label" for="baroAlwaysAvailable" data-loc="cheats_baroAlwaysAvailable"></label>
-                                    </div>
-                                    <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" id="baroFullyStocked" />
-                                        <label class="form-check-label" for="baroFullyStocked" data-loc="cheats_baroFullyStocked"></label>
-                                    </div>
                                     <div class="form-check">
                                         <input class="form-check-input" type="checkbox" id="unlockAllProfitTakerStages" />
                                         <label class="form-check-label" for="unlockAllProfitTakerStages" data-loc="cheats_unlockAllProfitTakerStages"></label>
@@ -933,6 +925,14 @@
                                     <input class="form-check-input" type="checkbox" id="worldState.baroTennoConRelay" />
                                     <label class="form-check-label" for="worldState.baroTennoConRelay" data-loc="worldState_baroTennoConRelay"></label>
                                 </div>
+                                <div class="form-check">
+                                    <input class="form-check-input" type="checkbox" id="baroAlwaysAvailable" />
+                                    <label class="form-check-label" for="baroAlwaysAvailable" data-loc="cheats_baroAlwaysAvailable"></label>
+                                </div>
+                                <div class="form-check">
+                                    <input class="form-check-input" type="checkbox" id="baroFullyStocked" />
+                                    <label class="form-check-label" for="baroFullyStocked" data-loc="cheats_baroFullyStocked"></label>
+                                </div>
                                 <div class="form-check">
                                     <input class="form-check-input" type="checkbox" id="worldState.varziaFullyStocked" />
                                     <label class="form-check-label" for="worldState.varziaFullyStocked" data-loc="worldState_varziaFullyStocked"></label>