diff --git a/dix/events.c b/dix/events.c
index 171e27721..f1e2fd80a 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4672,7 +4672,14 @@ int
 GetMaximumEventsNum() {
     /* Two base events -- core and device, plus valuator events.  Multiply
      * by two if we're doing key repeats. */
-    return 2 * (2 + MAX_VALUATOR_EVENTS);
+    int ret = 2 + MAX_VALUATOR_EVENTS;
+
+#ifdef XKB
+    if (noXkbExtension)
+#endif
+        ret *= 2;
+
+    return ret;
 }
 
 /**