diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index 9dc4e714ed7..f67bc9bf3ef 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -616,7 +616,9 @@ vop_nopoll(ap)
 	} */ *ap;
 {
 
-	return (poll_no_poll(ap->a_events));
+	if (ap->a_events & ~POLLSTANDARD)
+		return (POLLNVAL);
+	return (ap->a_events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM));
 }
 
 /*