diff --git a/src/evdev-tablet.c b/src/evdev-tablet.c
index 4a0d4b24..eccbcc9c 100644
--- a/src/evdev-tablet.c
+++ b/src/evdev-tablet.c
@@ -508,6 +508,7 @@ tablet_flush(struct tablet_dispatch *tablet,
 	}
 
 	if (tablet_has_status(tablet, TABLET_TOOL_LEAVING_PROXIMITY)) {
+		memset(tablet->changed_axes, 0, sizeof(tablet->changed_axes));
 		tablet_notify_proximity(&device->base,
 					time,
 					tool,
@@ -517,7 +518,6 @@ tablet_flush(struct tablet_dispatch *tablet,
 
 		tablet_set_status(tablet, TABLET_TOOL_OUT_OF_PROXIMITY);
 		tablet_unset_status(tablet, TABLET_TOOL_LEAVING_PROXIMITY);
-		memset(tablet->changed_axes, 0, sizeof(tablet->changed_axes));
 
 		tablet_change_to_left_handed(device);
 	}