diff --git a/libraries/WiFi/src/WiFi.cpp b/libraries/WiFi/src/WiFi.cpp
index da6102a33..157dc27c8 100644
--- a/libraries/WiFi/src/WiFi.cpp
+++ b/libraries/WiFi/src/WiFi.cpp
@@ -110,7 +110,9 @@ void arduino::WiFiClass::ensureDefaultAPNetworkConfiguration() {
 }
 
 void arduino::WiFiClass::end() {
-  disconnect();
+  if(_currentNetworkStatus == WL_CONNECTED) {
+    disconnect();
+  }
   _softAP = nullptr;
 }