diff --git a/lib/patrix/console.cpp b/lib/patrix/console.cpp
index ed191ab..da70292 100644
--- a/lib/patrix/console.cpp
+++ b/lib/patrix/console.cpp
@@ -113,6 +113,7 @@ void _reboot() {
   info("Rebooting...");
   delay(500);
   yield();
+  mqttDisconnect();
   ESP.restart();
 }
 
diff --git a/lib/patrix/wifi.cpp b/lib/patrix/wifi.cpp
index 2daad48..3f9189b 100644
--- a/lib/patrix/wifi.cpp
+++ b/lib/patrix/wifi.cpp
@@ -93,6 +93,7 @@ void otaSetup() {
   });
   ArduinoOTA.onEnd([] {
     info("OTA Complete!");
+    mqttDisconnect();
   });
   ArduinoOTA.onError([](ota_error_t e) {
     const char *name;