Index: sys/kern/kern_event.c
===================================================================
--- sys/kern/kern_event.c
+++ sys/kern/kern_event.c
@@ -1325,7 +1325,8 @@
 		kn->kn_status |= KN_DISABLED;
 	}
 
-	if ((kn->kn_status & KN_DISABLED) == 0)
+	if ((kn->kn_status & KN_DISABLED) == 0 ||
+	    (kev->flags & EV_ENABLE) != 0)
 		event = kn->kn_fop->f_event(kn, 0);
 	else
 		event = 0;
Index: tests/sys/kqueue/read.c
===================================================================
--- tests/sys/kqueue/read.c
+++ tests/sys/kqueue/read.c
@@ -124,15 +124,17 @@
 
     test_begin(test_id);
 
-    /* Add an event, then disable it. */
-    EV_SET(&kev, sockfd[0], EVFILT_READ, EV_ADD, 0, 0, &sockfd[0]);
-    if (kevent(kqfd, &kev, 1, NULL, 0, NULL) < 0)
-        err(1, "%s", test_id);
-    EV_SET(&kev, sockfd[0], EVFILT_READ, EV_DISABLE, 0, 0, &sockfd[0]);
+    /*
+     * Write to the socket before adding the event. This way we can verify that
+     * enabling a triggered kevent causes the event to be returned immediately.
+     */
+    kevent_socket_fill();
+
+    /* Add a disabled event. */
+    EV_SET(&kev, sockfd[0], EVFILT_READ, EV_ADD | EV_DISABLE, 0, 0, &sockfd[0]);
     if (kevent(kqfd, &kev, 1, NULL, 0, NULL) < 0)
         err(1, "%s", test_id);
 
-    kevent_socket_fill();
     test_no_kevents();
 
     /* Re-enable the knote, then see if an event is generated */