diff --git a/examples/Azure_IoT_Central_ESP32/Azure_IoT_Central_ESP32.ino b/examples/Azure_IoT_Central_ESP32/Azure_IoT_Central_ESP32.ino
index 7413ac95..23254057 100644
--- a/examples/Azure_IoT_Central_ESP32/Azure_IoT_Central_ESP32.ino
+++ b/examples/Azure_IoT_Central_ESP32/Azure_IoT_Central_ESP32.ino
@@ -406,8 +406,8 @@ void loop()
 {
   if (WiFi.status() != WL_CONNECTED)
   {
+    azure_iot_stop(&azure_iot);
     connect_to_wifi();
-    azure_iot_start(&azure_iot);
   }
   else
   {
@@ -428,7 +428,9 @@ void loop()
       case azure_iot_error:
         LogError("Azure IoT client is in error state.");
         azure_iot_stop(&azure_iot);
-        WiFi.disconnect();
+        break;
+      case azure_iot_disconnected:
+        azure_iot_start(&azure_iot);
         break;
       default:
         break;
diff --git a/examples/Azure_IoT_Central_ESP32_AzureIoTKit/Azure_IoT_Central_ESP32_AzureIoTKit.ino b/examples/Azure_IoT_Central_ESP32_AzureIoTKit/Azure_IoT_Central_ESP32_AzureIoTKit.ino
index b2459c4a..0105f013 100644
--- a/examples/Azure_IoT_Central_ESP32_AzureIoTKit/Azure_IoT_Central_ESP32_AzureIoTKit.ino
+++ b/examples/Azure_IoT_Central_ESP32_AzureIoTKit/Azure_IoT_Central_ESP32_AzureIoTKit.ino
@@ -410,8 +410,8 @@ void loop()
 {
   if (WiFi.status() != WL_CONNECTED)
   {
+    azure_iot_stop(&azure_iot);
     connect_to_wifi();
-    azure_iot_start(&azure_iot);
   }
   else
   {
@@ -432,7 +432,9 @@ void loop()
       case azure_iot_error:
         LogError("Azure IoT client is in error state.");
         azure_iot_stop(&azure_iot);
-        WiFi.disconnect();
+        break;
+      case azure_iot_disconnected:
+        azure_iot_start(&azure_iot);
         break;
       default:
         break;