diff --git a/dix/property.c b/dix/property.c
index 0905e2dff7..90dce14328 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -517,14 +517,22 @@ DeleteAllWindowProperties(WindowPtr pWin)
 int
 ProcGetProperty(ClientPtr client)
 {
+    REQUEST(xGetPropertyReq);
+    REQUEST_SIZE_MATCH(xGetPropertyReq);
+
+    if (client->swapped) {
+        swapl(&stuff->window);
+        swapl(&stuff->property);
+        swapl(&stuff->type);
+        swapl(&stuff->longOffset);
+        swapl(&stuff->longLength);
+    }
+
     PropertyPtr pProp, prevProp;
     unsigned long n, len, ind;
     int rc;
     Mask win_mode = DixGetPropAccess, prop_mode = DixReadAccess;
 
-    REQUEST(xGetPropertyReq);
-    REQUEST_SIZE_MATCH(xGetPropertyReq);
-
     if (!ValidAtom(stuff->property)) {
         client->errorValue = stuff->property;
         return BadAtom;
diff --git a/dix/swapreq.c b/dix/swapreq.c
index f215972cc3..964274f98d 100644
--- a/dix/swapreq.c
+++ b/dix/swapreq.c
@@ -146,19 +146,6 @@ SProcConfigureWindow(ClientPtr client)
 
 }
 
-int _X_COLD
-SProcGetProperty(ClientPtr client)
-{
-    REQUEST(xGetPropertyReq);
-    REQUEST_SIZE_MATCH(xGetPropertyReq);
-    swapl(&stuff->window);
-    swapl(&stuff->property);
-    swapl(&stuff->type);
-    swapl(&stuff->longOffset);
-    swapl(&stuff->longLength);
-    return ((*ProcVector[X_GetProperty]) (client));
-}
-
 int _X_COLD
 SProcConvertSelection(ClientPtr client)
 {
diff --git a/dix/swapreq.h b/dix/swapreq.h
index b4309a85d4..62e9cc190d 100644
--- a/dix/swapreq.h
+++ b/dix/swapreq.h
@@ -56,7 +56,6 @@ int SProcFillPoly(ClientPtr client);
 int SProcFreeColors(ClientPtr client);
 int SProcGetImage(ClientPtr client);
 int SProcGetMotionEvents(ClientPtr client);
-int SProcGetProperty(ClientPtr client);
 int SProcImageText(ClientPtr client);
 int SProcListFonts(ClientPtr client);
 int SProcListFontsWithInfo(ClientPtr client);
diff --git a/dix/tables.c b/dix/tables.c
index ad67746c4a..0f27bb68ae 100644
--- a/dix/tables.c
+++ b/dix/tables.c
@@ -352,7 +352,7 @@ int (*SwappedProcVector[256]) (ClientPtr /* client */) = {
     ProcGetAtomName,
     ProcChangeProperty,
     ProcDeleteProperty,
-    SProcGetProperty,                   /* 20 */
+    ProcGetProperty,                    /* 20 */
     ProcListProperties,
     ProcSetSelectionOwner,
     ProcGetSelectionOwner,