diff --git a/randr/rrproperty.c b/randr/rrproperty.c
index 315e5b275..122f5ab64 100644
--- a/randr/rrproperty.c
+++ b/randr/rrproperty.c
@@ -727,24 +727,26 @@ ProcRRGetOutputProperty(ClientPtr client)
         swapl(&rep.bytesAfter);
         swapl(&rep.nItems);
     }
-    WriteToClient(client, sizeof(rep), &rep);
     if (len) {
         memcpy(extra, (char *) prop_value->data + ind, len);
         switch (rep.format) {
         case 32:
-            client->pSwapReplyFunc = (ReplySwapPtr) CopySwap32Write;
+            if (client->swapped)
+                SwapLongs((CARD32*)extra, len / sizeof(CARD32));
             break;
         case 16:
-            client->pSwapReplyFunc = (ReplySwapPtr) CopySwap16Write;
+            if (client->swapped)
+                SwapShorts((short*)extra, len / sizeof(CARD16));
             break;
         default:
-            client->pSwapReplyFunc = (ReplySwapPtr) WriteToClient;
             break;
         }
-        WriteSwappedDataToClient(client, len, extra);
-        free(extra);
     }
 
+    WriteToClient(client, sizeof(rep), &rep);
+    WriteToClient(client, len, extra);
+    free(extra);
+
     if (stuff->delete && (rep.bytesAfter == 0)) {     /* delete the Property */
         *prev = prop->next;
         RRDestroyOutputProperty(prop);