diff --git a/main/main.ino b/main/main.ino
index a329990..ec60785 100644
--- a/main/main.ino
+++ b/main/main.ino
@@ -2195,9 +2195,6 @@ void MQTTHttpsFWUpdate(char* topicOri, JsonObject& HttpsFwUpdateData) {
 #  endif
 #  ifdef ESP32
       } else if (strcmp(version, "latest") == 0) {
-#    if defined(ZgatewayBT)
-        stopProcessing();
-#    endif
         systemUrl = RELEASE_LINK + latestVersion + "/" + ENV_NAME + "-firmware.bin";
         url = systemUrl.c_str();
         Log.notice(F("Using system OTA url with latest version %s" CR), url);
@@ -2214,7 +2211,9 @@ void MQTTHttpsFWUpdate(char* topicOri, JsonObject& HttpsFwUpdateData) {
         Log.error(F("Invalid URL" CR));
         return;
       }
-
+#  if defined(ZgatewayBT)
+      stopProcessing();
+#  endif
       Log.warning(F("Starting firmware update" CR));
       SendReceiveIndicatorON();
       ErrorIndicatorON();