diff --git a/usr.sbin/autofs/autounmountd.c b/usr.sbin/autofs/autounmountd.c
index 3a13225aa80..f65e78a8106 100644
--- a/usr.sbin/autofs/autounmountd.c
+++ b/usr.sbin/autofs/autounmountd.c
@@ -244,8 +244,11 @@ do_wait(int kq, double sleep_time)
 		log_debugx("waiting for filesystem event");
 		nevents = kevent(kq, NULL, 0, &unused, 1, NULL);
 	}
-	if (nevents < 0)
+	if (nevents < 0) {
+		if (errno == EINTR)
+			return;
 		log_err(1, "kevent");
+	}
 
 	if (nevents == 0) {
 		log_debugx("timeout reached");