diff --git a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
index aed2b620d6..41f4dcb098 100644
--- a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
+++ b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
@@ -450,9 +450,10 @@ MouseDevice::_ControlThread()
 			}
 
 			if (read.event == MS_READ_TOUCHPAD) {
-				lastTouchpadMovement = read.u.touchpad;
 				status = fTouchpadMovementMaker.EventToMovement(&read.u.touchpad,
 					&movements, touchpadEventTimeout);
+				if (status == B_OK)
+					lastTouchpadMovement = read.u.touchpad;
 			} else if (read.event == MS_READ) {
 				movements = read.u.mouse;
 				touchpadEventTimeout = -1;