diff --git a/dix/getevents.c b/dix/getevents.c
index fa5890eec..7ebddc419 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -1540,6 +1540,10 @@ emulate_scroll_button_events(InternalEvent *events,
     ax = &dev->valuator->axes[axis];
     incr = ax->scroll.increment;
 
+    BUG_WARN_MSG(incr == 0, "for device %s\n", dev->name);
+    if (incr == 0)
+        return 0;
+
     if (type != ButtonPress && type != ButtonRelease)
         flags |= POINTER_EMULATED;