diff --git a/src/ChkTypEv.c b/src/ChkTypEv.c
index 8ca1c804..2e9bcdd0 100644
--- a/src/ChkTypEv.c
+++ b/src/ChkTypEv.c
@@ -57,6 +57,7 @@ Bool XCheckTypedEvent (
 		if (qelt->event.type == type) {
 		    *event = qelt->event;
 		    _XDeq(dpy, prev, qelt);
+		    _XStoreEventCookie(dpy, event);
 		    UnlockDisplay(dpy);
 		    return True;
 		}
diff --git a/src/ChkTypWEv.c b/src/ChkTypWEv.c
index 92b3f5d9..2f247be2 100644
--- a/src/ChkTypWEv.c
+++ b/src/ChkTypWEv.c
@@ -59,6 +59,7 @@ Bool XCheckTypedWindowEvent (
 		    (qelt->event.type == type)) {
 		    *event = qelt->event;
 		    _XDeq(dpy, prev, qelt);
+		    _XStoreEventCookie(dpy, event);
 		    UnlockDisplay(dpy);
 		    return True;
 		}