diff --git a/libraries/ArduinoOTA/ArduinoOTA.cpp b/libraries/ArduinoOTA/ArduinoOTA.cpp
index 1ef83b895f..4ee31e3751 100644
--- a/libraries/ArduinoOTA/ArduinoOTA.cpp
+++ b/libraries/ArduinoOTA/ArduinoOTA.cpp
@@ -359,9 +359,14 @@ void ArduinoOTAClass::_runUpdate() {
 }
 
 void ArduinoOTAClass::end() {
+    if (!_initialized)
+      return;
+
     _initialized = false;
-    _udp_ota->unref();
-    _udp_ota = 0;
+    if(_udp_ota){
+        _udp_ota->unref();
+        _udp_ota = 0;
+    }
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_MDNS)
     if(_useMDNS){
         MDNS.end();