diff --git a/netstack/src/scheme/udp.rs b/netstack/src/scheme/udp.rs
index 918d38f80a..b0ad69bbf5 100644
--- a/netstack/src/scheme/udp.rs
+++ b/netstack/src/scheme/udp.rs
@@ -241,7 +241,7 @@ impl<'a> SchemeSocket for UdpSocket<'a> {
                         if remote_endpoint.is_specified() {
                             remote_endpoint
                         } else {
-                            udp_handle.data
+                            return Err(SyscallError::new(syscall::EADDRNOTAVAIL));
                         },
                     ))
                 } else {