diff --git a/render/render.c b/render/render.c
index 1f07fc93fa..37e5d50dd0 100644
--- a/render/render.c
+++ b/render/render.c
@@ -96,7 +96,6 @@ static int ProcRenderCreateConicalGradient(ClientPtr pClient);
 
 static int ProcRenderDispatch(ClientPtr pClient);
 
-static int SProcRenderQueryVersion(ClientPtr pClient);
 static int SProcRenderQueryPictIndexValues(ClientPtr pClient);
 static int SProcRenderCreatePicture(ClientPtr pClient);
 static int SProcRenderChangePicture(ClientPtr pClient);
@@ -166,7 +165,7 @@ ProcRenderQueryVersion,
         ProcRenderCreateRadialGradient, ProcRenderCreateConicalGradient};
 
 int (*SProcRenderVector[RenderNumberRequests]) (ClientPtr) = {
-SProcRenderQueryVersion,
+        ProcRenderQueryVersion,
         ProcRenderQueryPictFormats,
         SProcRenderQueryPictIndexValues,
         ProcRenderQueryDithers,
@@ -253,9 +252,13 @@ ProcRenderQueryVersion(ClientPtr client)
     RenderClientPtr pRenderClient = GetRenderClient(client);
 
     REQUEST(xRenderQueryVersionReq);
-
     REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
 
+    if (client->swapped) {
+        swapl(&stuff->majorVersion);
+        swapl(&stuff->minorVersion);
+    }
+
     pRenderClient->major_version = stuff->majorVersion;
     pRenderClient->minor_version = stuff->minorVersion;
 
@@ -1960,16 +1963,6 @@ ProcRenderDispatch(ClientPtr client)
         return BadRequest;
 }
 
-static int _X_COLD
-SProcRenderQueryVersion(ClientPtr client)
-{
-    REQUEST(xRenderQueryVersionReq);
-    REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
-    swapl(&stuff->majorVersion);
-    swapl(&stuff->minorVersion);
-    return ProcRenderQueryVersion(client);
-}
-
 static int _X_COLD
 SProcRenderQueryPictIndexValues(ClientPtr client)
 {