diff --git a/lib/listener-partner/middlewares/common.js b/lib/listener-partner/middlewares/common.js
index cf57676..299d3a7 100644
--- a/lib/listener-partner/middlewares/common.js
+++ b/lib/listener-partner/middlewares/common.js
@@ -1,6 +1,7 @@
 'use strict';
 
-const uniqid = require('uniqid');
+// const uniqid = require('uniqid');
+const uuidv1 = require('uuid/v1');
 const logger = require('komodo-sdk/logger');
 
 module.exports = function common(req, res, next) {
@@ -9,7 +10,7 @@ module.exports = function common(req, res, next) {
         return;
     }
 
-    res.locals.xid = uniqid();
+    res.locals.xid = uuidv1();
     res.locals.x_http_request_ts = new Date();
 
     logger.info('Got request from partner', {