diff --git a/library.properties b/library.properties
index 56a1fcc9..b5239511 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=Adafruit IO Arduino
-version=3.5.1
+version=3.6.0
 author=Adafruit
 maintainer=Adafruit <adafruitio@adafruit.com>
 sentence=Arduino library to access Adafruit IO.
diff --git a/src/wifi/AdafruitIO_AIRLIFT.h b/src/wifi/AdafruitIO_AIRLIFT.h
index 487243e2..a6605f51 100644
--- a/src/wifi/AdafruitIO_AIRLIFT.h
+++ b/src/wifi/AdafruitIO_AIRLIFT.h
@@ -156,7 +156,6 @@ class AdafruitIO_AIRLIFT : public AdafruitIO {
     if (strlen(_ssid) == 0) {
       _status = AIO_SSID_INVALID;
     } else {
-      _disconnect();
       // setup ESP32 pins
       if (_ssPin != -1) {
         WiFi.setPins(_ssPin, _ackPin, _rstPin, _gpio0Pin, _wifi);
@@ -165,6 +164,9 @@ class AdafruitIO_AIRLIFT : public AdafruitIO {
       // check esp32 module version against NINAFWVER
       firmwareCheck();
 
+      // disconnect from possible previous connection
+      _disconnect();
+
       // check for esp32 module
       if (WiFi.status() == WL_NO_MODULE) {
         AIO_DEBUG_PRINTLN("No ESP32 module detected!");