diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index cd2e1a191..450b39ef5 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -1022,6 +1022,16 @@ SProcXChangeDeviceProperty(ClientPtr client)
     swapl(&stuff->property);
     swapl(&stuff->type);
     swapl(&stuff->nUnits);
+    switch (stuff->format) {
+    case 8:
+        break;
+    case 16:
+        SwapRestS(stuff);
+        break;
+    case 32:
+        SwapRestL(stuff);
+        break;
+    }
     return (ProcXChangeDeviceProperty(client));
 }
 
@@ -1262,6 +1272,16 @@ SProcXIChangeProperty(ClientPtr client)
     swapl(&stuff->property);
     swapl(&stuff->type);
     swapl(&stuff->num_items);
+    switch (stuff->format) {
+    case 8:
+        break;
+    case 16:
+        SwapRestS(stuff);
+        break;
+    case 32:
+        SwapRestL(stuff);
+        break;
+    }
     return (ProcXIChangeProperty(client));
 }