diff --git a/src/ChkMaskEv.c b/src/ChkMaskEv.c
index e19a991f..bc1a279f 100644
--- a/src/ChkMaskEv.c
+++ b/src/ChkMaskEv.c
@@ -59,7 +59,7 @@ Bool XCheckMaskEvent (
 	    for (qelt = prev ? prev->next : dpy->head;
 		 qelt;
 		 prev = qelt, qelt = qelt->next) {
-		if ((qelt->event.type < LASTEvent) &&
+		if ((qelt->event.type < GenericEvent) &&
 		    (_Xevent_to_mask[qelt->event.type] & mask) &&
 		    ((qelt->event.type != MotionNotify) ||
 		     (mask & AllPointers) ||
diff --git a/src/MaskEvent.c b/src/MaskEvent.c
index 8f0c0d48..acd903f9 100644
--- a/src/MaskEvent.c
+++ b/src/MaskEvent.c
@@ -58,7 +58,7 @@ XMaskEvent (
 	    for (qelt = prev ? prev->next : dpy->head;
 		 qelt;
 		 prev = qelt, qelt = qelt->next) {
-		if ((qelt->event.type < LASTEvent) &&
+		if ((qelt->event.type < GenericEvent) &&
 		    (_Xevent_to_mask[qelt->event.type] & mask) &&
 		    ((qelt->event.type != MotionNotify) ||
 		     (mask & AllPointers) ||