diff --git a/src/services/worldStateService.ts b/src/services/worldStateService.ts
index f3681e7b..3891b64a 100644
--- a/src/services/worldStateService.ts
+++ b/src/services/worldStateService.ts
@@ -2505,11 +2505,24 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
         });
     }
 
-    if (config.worldState?.naberusNights) {
+    const isOctober = date.getUTCMonth() == 9; // October = month index 9
+    if (config.worldState?.naberusNights ?? isOctober) {
         worldState.Goals.push({
             _id: { $oid: "66fd602de1778d583419e8e7" },
-            Activation: { $date: { $numberLong: "1727881200000" } },
-            Expiry: { $date: { $numberLong: "2000000000000" } },
+            Activation: {
+                $date: {
+                    $numberLong: config.worldState?.naberusNights
+                        ? "1727881200000"
+                        : Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), 1).toString()
+                }
+            },
+            Expiry: {
+                $date: {
+                    $numberLong: config.worldState?.naberusNights
+                        ? "2000000000000"
+                        : Date.UTC(date.getUTCFullYear(), date.getUTCMonth() + 1, 1).toString()
+                }
+            },
             Count: 0,
             Goal: 0,
             Success: 0,
@@ -2522,6 +2535,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
         });
     }
 
+
     if (config.worldState?.bellyOfTheBeast) {
         worldState.Goals.push({
             _id: { $oid: "67a5035c2a198564d62e165e" },