diff --git a/Xi/exevents.c b/Xi/exevents.c
index a48ba115d..f13959fc9 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -574,6 +574,8 @@ DeepCopyDeviceClasses(DeviceIntPtr from, DeviceIntPtr to)
         memcpy(v, from->valuator, sizeof(ValuatorClassRec));
         v->motion = NULL;
         AllocateMotionHistory(to); /*XXX should be copied somehow */
+        v->first_motion = 0;
+        v->last_motion = 0;
 
         v->axes = (AxisInfoPtr)&v[1];
         memcpy(v->axes, from->valuator->axes, v->numAxes * sizeof(AxisInfo));