diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp
index 271aedc1b..4bc0a1e03 100644
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -632,7 +632,7 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
             mqtt->onSend(*p_encrypted, *p, p->channel);
 #endif
 #if HAS_UDP_MULTICAST
-        if ((decoded || p_encrypted->pki_encrypted) && !isFromUs(p) && udpThread &&
+        if ((decoded || p_encrypted->pki_encrypted) && udpThread &&
             config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) {
             udpThread->onSend(const_cast<meshtastic_MeshPacket *>(p_encrypted));
         }
diff --git a/src/mesh/udp/UdpMulticastThread.h b/src/mesh/udp/UdpMulticastThread.h
index daf529924..9128d3b5c 100644
--- a/src/mesh/udp/UdpMulticastThread.h
+++ b/src/mesh/udp/UdpMulticastThread.h
@@ -59,7 +59,7 @@ class UdpMulticastThread : public concurrency::OSThread
     int32_t runOnce() override
     {
         canSleep = true;
-        // TODO: Might consider a heartbeat for discovery or keep alive?
+        // TODO: Implement nodeinfo broadcast
         return UDP_MULTICAST_THREAD_INTERVAL_MS;
     }
 
@@ -67,4 +67,4 @@ class UdpMulticastThread : public concurrency::OSThread
     IPAddress udpIpAddress;
     AsyncUDP udp;
 };
-#endif // ARCH_ESP32
+#endif // ARCH_ESP32
\ No newline at end of file