diff --git a/lib/ConnectionManager.js b/lib/ConnectionManager.js
index 70fc30a..a2b7e7b 100644
--- a/lib/ConnectionManager.js
+++ b/lib/ConnectionManager.js
@@ -657,8 +657,8 @@ ConnectionManager.prototype.onPacketQueueReadable = function () {
                 header.type !== jute.OP_CODES.PING &&
                 header.type !== jute.OP_CODES.AUTH) {
 
+            this.xid = (this.xid % 2147483647) + 1;
             header.xid = this.xid;
-            this.xid += 1;
 
             // Only put requests that are not connect, ping and auth into
             // the pending queue.