diff --git a/libraries/ESP8266WiFi/examples/WiFiScan/WiFiScan.ino b/libraries/ESP8266WiFi/examples/WiFiScan/WiFiScan.ino
index 69614c0de7..e5e26b189d 100644
--- a/libraries/ESP8266WiFi/examples/WiFiScan/WiFiScan.ino
+++ b/libraries/ESP8266WiFi/examples/WiFiScan/WiFiScan.ino
@@ -10,7 +10,11 @@ void setup() {
 
   // Set WiFi to station mode and disconnect from an AP if it was previously connected
   WiFi.mode(WIFI_STA);
-  WiFi.disconnect();
+
+  // Check if there is any connections made previously. If there is any, disconnect
+  if (WiFi.status() == WL_CONNECTED) {
+    WiFi.disconnect();
+  }
   delay(100);
 
   Serial.println("Setup done");