diff --git a/src/api.cpp b/src/api.cpp
index 86d97df..3129d20 100644
--- a/src/api.cpp
+++ b/src/api.cpp
@@ -21,6 +21,7 @@ uint16_t foundVendorId = 0;    // Store ID of found vendor
 uint16_t foundFilamentId = 0;  // Store ID of found filament
 uint16_t createdFilamentId = 0;  // Store ID of newly created filament
 uint16_t createdSpoolId = 0;  // Store ID of newly created spool
+uint16_t updateOctoSpoolId = 0; // Store spool ID for OctoPrint update
 bool spoolmanConnected = false;
 bool spoolmanExtraFieldsChecked = false;
 TaskHandle_t* apiTask;
diff --git a/src/api.h b/src/api.h
index 83a88c7..a8aac63 100644
--- a/src/api.h
+++ b/src/api.h
@@ -33,6 +33,7 @@ extern bool sendOctoUpdate;
 extern String octoUrl;
 extern String octoToken;
 extern bool spoolmanConnected;
+extern uint16_t updateOctoSpoolId;
 
 bool checkSpoolmanInstance();
 bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk);
diff --git a/src/bambu.cpp b/src/bambu.cpp
index 8eae33d..3e2ae43 100644
--- a/src/bambu.cpp
+++ b/src/bambu.cpp
@@ -21,7 +21,7 @@ TaskHandle_t BambuMqttTask;
 bool bambuDisabled = false;
 
 bool bambu_connected = false;
-int autoSetToBambuSpoolId = 0;
+uint16_t autoSetToBambuSpoolId = 0;
 
 BambuCredentials bambuCredentials;
 
diff --git a/src/bambu.h b/src/bambu.h
index bf8836e..4fce1f3 100644
--- a/src/bambu.h
+++ b/src/bambu.h
@@ -37,7 +37,7 @@ extern bool bambu_connected;
 extern int ams_count;
 extern AMSData ams_data[MAX_AMS];
 //extern bool autoSendToBambu;
-extern int autoSetToBambuSpoolId;
+extern uint16_t autoSetToBambuSpoolId;
 extern bool bambuDisabled;
 extern BambuCredentials bambuCredentials;
 
diff --git a/src/main.cpp b/src/main.cpp
index b17fb23..4cfe8d9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -242,6 +242,10 @@ void loop() {
         {
           autoSetToBambuSpoolId = activeSpoolId.toInt();
         }
+        if (octoEnabled) 
+        {
+          updateOctoSpoolId = activeSpoolId.toInt();
+        }
       }
       else
       {
@@ -271,7 +275,7 @@ void loop() {
 
     if(octoEnabled && sendOctoUpdate && spoolmanApiState == API_IDLE)
     {
-      updateSpoolOcto(activeSpoolId.toInt());
+      updateSpoolOcto(updateOctoSpoolId);
       sendOctoUpdate = false;
     }
   }