diff --git a/xkb/xkb.c b/xkb/xkb.c
index 8e34fde7b4..f5e6cd6a2c 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -493,12 +493,22 @@ int
 ProcXkbBell(ClientPtr client)
 {
     REQUEST(xkbBellReq);
+    REQUEST_SIZE_MATCH(xkbBellReq);
+
+    if (client->swapped) {
+        swaps(&stuff->deviceSpec);
+        swaps(&stuff->bellClass);
+        swaps(&stuff->bellID);
+        swapl(&stuff->name);
+        swapl(&stuff->window);
+        swaps(&stuff->pitch);
+        swaps(&stuff->duration);
+    }
+
     DeviceIntPtr dev;
     WindowPtr pWin;
     int rc;
 
-    REQUEST_SIZE_MATCH(xkbBellReq);
-
     if (!(client->xkbClientFlags & _XkbClientInitialized))
         return BadAccess;
 
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index cd876b40e2..7ca180f5ba 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -128,21 +128,6 @@ SProcXkbSelectEvents(ClientPtr client)
     return ProcXkbSelectEvents(client);
 }
 
-static int _X_COLD
-SProcXkbBell(ClientPtr client)
-{
-    REQUEST(xkbBellReq);
-    REQUEST_SIZE_MATCH(xkbBellReq);
-    swaps(&stuff->deviceSpec);
-    swaps(&stuff->bellClass);
-    swaps(&stuff->bellID);
-    swapl(&stuff->name);
-    swapl(&stuff->window);
-    swaps(&stuff->pitch);
-    swaps(&stuff->duration);
-    return ProcXkbBell(client);
-}
-
 static int _X_COLD
 SProcXkbGetState(ClientPtr client)
 {
@@ -321,7 +306,7 @@ SProcXkbDispatch(ClientPtr client)
     case X_kbSelectEvents:
         return SProcXkbSelectEvents(client);
     case X_kbBell:
-        return SProcXkbBell(client);
+        return ProcXkbBell(client);
     case X_kbGetState:
         return SProcXkbGetState(client);
     case X_kbLatchLockState: