diff --git a/api/src/unraid-api/config/onboarding-tracker.module.ts b/api/src/unraid-api/config/onboarding-tracker.module.ts
index 429681c62..0ed02867c 100644
--- a/api/src/unraid-api/config/onboarding-tracker.module.ts
+++ b/api/src/unraid-api/config/onboarding-tracker.module.ts
@@ -203,7 +203,9 @@ export class OnboardingTracker implements OnApplicationBootstrap, OnApplicationS
         if (overrideState?.activationOnboarding) {
             const updatedOverride = this.markOverrideStepCompleted(overrideState, stepId);
             this.onboardingOverrides.setState(updatedOverride);
-            return this.buildOverrideSnapshot(updatedOverride.activationOnboarding);
+            if (updatedOverride.activationOnboarding) {
+                return this.buildOverrideSnapshot(updatedOverride.activationOnboarding);
+            }
         }
 
         const currentVersion =
@@ -261,7 +263,9 @@ export class OnboardingTracker implements OnApplicationBootstrap, OnApplicationS
         if (overrideState?.activationOnboarding) {
             const updatedOverride = this.resetOverrideSteps(overrideState);
             this.onboardingOverrides.setState(updatedOverride);
-            return this.buildOverrideSnapshot(updatedOverride.activationOnboarding);
+            if (updatedOverride.activationOnboarding) {
+                return this.buildOverrideSnapshot(updatedOverride.activationOnboarding);
+            }
         }
 
         await this.ensureStateLoaded();