diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 62ed7482..56c618eb 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -155,9 +155,14 @@ tp_detect_wobbling(struct tp_dispatch *tp,
 	int dx, dy;
 	uint64_t dtime;
 
-	if (!(tp->queued & TOUCHPAD_EVENT_MOTION) || tp->hysteresis.enabled)
+	if (tp->hysteresis.enabled)
 		return;
 
+	if (!(tp->queued & TOUCHPAD_EVENT_MOTION)) {
+		t->hysteresis.x_motion_history = 0;
+		return;
+	}
+
 	if (t->last_point.x == 0) { /* first invocation */
 		dx = 0;
 		dy = 0;