diff --git a/lib/UdpListener/src/UdpListener.h b/lib/UdpListener/src/UdpListener.h
index 90cacff1e..a94787902 100644
--- a/lib/UdpListener/src/UdpListener.h
+++ b/lib/UdpListener/src/UdpListener.h
@@ -204,4 +204,4 @@ private:
     int8_t  _udp_index;                 // current index in the ring buffer
 };
 
-#endif //UDPCONTEXTLIGHT_H
\ No newline at end of file
+#endif //UDPMULTICASTLISTENER_H
\ No newline at end of file
diff --git a/tasmota/support_udp.ino b/tasmota/support_udp.ino
index e8974d664..588ad2f2f 100644
--- a/tasmota/support_udp.ino
+++ b/tasmota/support_udp.ino
@@ -58,9 +58,9 @@ bool UdpDisconnect(void)
   if (udp_connected) {
     // flush any outgoing packet
     PortUdp.flush();
+    UdpCtx.disconnect();
 #ifdef USE_DEVICE_GROUPS
     // stop
-    UdpCtx.stop();
     PortUdp.stop();
 #else // USE_DEVICE_GROUPS
     // stop all