diff --git a/src/accessories/koboldVacuumRobot.ts b/src/accessories/koboldVacuumRobot.ts
index b246f4d..7204854 100644
--- a/src/accessories/koboldVacuumRobot.ts
+++ b/src/accessories/koboldVacuumRobot.ts
@@ -173,6 +173,11 @@ export class KoboldVacuumRobotAccessory
 
 		// Start background update
 		this.updateRobotPeriodically().then(() => {
+			// Add special characteristics to set spot cleaning options
+			this.spotPlusFeatures = ((typeof this.robot.availableServices.spotCleaning !== 'undefined') && this.robot.availableServices.spotCleaning.includes("basic"));
+			this.addSpotCleanCharacteristics();
+
+			// Save/Load options
 			if (!accessory.context.options)
 			{
 				this.options.eco = this.robot.eco;
@@ -180,10 +185,6 @@ export class KoboldVacuumRobotAccessory
 				this.options.extraCare = this.robot.navigationMode == 2;
 				this.debug(DebugType.INFO, "Options initially set to eco: " + this.options.eco + ", noGoLines: " + this.options.noGoLines + ", extraCare: " + this.options.extraCare);
 				accessory.context.options = this.options;
-
-				// Add special characteristics to set spot cleaning options
-				this.spotPlusFeatures = ((typeof this.robot.availableServices.spotCleaning !== 'undefined') && this.robot.availableServices.spotCleaning.includes("basic"));
-				this.addSpotCleanCharacteristics();
 			}
 			else
 			{