diff --git a/src/add-ons/kernel/network/protocols/udp/udp.cpp b/src/add-ons/kernel/network/protocols/udp/udp.cpp
index 25dddea380..e205794215 100644
--- a/src/add-ons/kernel/network/protocols/udp/udp.cpp
+++ b/src/add-ons/kernel/network/protocols/udp/udp.cpp
@@ -840,6 +840,7 @@ status_t
 UdpEndpoint::Free()
 {
 	TRACE_EP("Free()");
+	fManager->UnbindEndpoint(this);
 	return sUdpEndpointManager->FreeEndpoint(fManager);
 }