diff --git a/src/ev_evports.c b/src/ev_evports.c
index 7d3e8a8..0a7df15 100644
--- a/src/ev_evports.c
+++ b/src/ev_evports.c
@@ -178,10 +178,8 @@
 	thread_idle_now();
 	thread_harmless_now();
 
-	/* Now let's wait for polled events.
-	 * Check if the signal queue is not empty in case we received a signal
-	 * before entering the loop, so we don't wait MAX_DELAY_MS for nothing */
-	wait_time = (wake | signal_queue_len) ? 0 : compute_poll_timeout(exp);
+	/* Now let's wait for polled events. */
+	wait_time = wake ? 0 : compute_poll_timeout(exp);
 	clock_entering_poll();
 
 	do {
@@ -219,7 +217,7 @@
 			break;
 		if (timeout || !wait_time)
 			break;
-		if (signal_queue_len || wake)
+		if (wake)
 			break;
 		if (tick_isset(exp) && tick_is_expired(exp, now_ms))
 			break;