diff --git a/passt.c b/passt.c
index aa9ba8a..2d674bf 100644
--- a/passt.c
+++ b/passt.c
@@ -325,8 +325,7 @@ loop:
 				tcp_sock_handler(&c, ref, eventmask, &now);
 			break;
 		case EPOLL_TYPE_UDP:
-			if (!c.no_udp)
-				udp_sock_handler(&c, ref, eventmask, &now);
+			udp_sock_handler(&c, ref, eventmask, &now);
 			break;
 		case EPOLL_TYPE_ICMP:
 			icmp_sock_handler(&c, ref);
diff --git a/udp.c b/udp.c
index 62f8360..138e7ab 100644
--- a/udp.c
+++ b/udp.c
@@ -756,7 +756,7 @@ void udp_sock_handler(struct ctx *c, union epoll_ref ref, uint32_t events,
 	struct mmsghdr *mmh_recv;
 	int i, m;
 
-	if (!(events & EPOLLIN))
+	if (c->no_udp || !(events & EPOLLIN))
 		return;
 
 	if (v6) {