diff --git a/lib/https/index.js b/lib/https/index.js
index 3653c2bde..0542dc927 100644
--- a/lib/https/index.js
+++ b/lib/https/index.js
@@ -485,7 +485,7 @@ function resolveWebsocket(socket, wss) {
     } else {
       var clientId = headers[config.CLIENT_ID_HEADER];
       if (clientId) {
-        if (util.isEnable(socket, 'keepClientId')) {
+        if (!util.isEnable(socket, 'keepClientId')) {
           util.removeClientId(headers);
         }
         data.clientId = clientId;
diff --git a/lib/inspectors/res.js b/lib/inspectors/res.js
index f01906c09..868310482 100644
--- a/lib/inspectors/res.js
+++ b/lib/inspectors/res.js
@@ -523,7 +523,7 @@ module.exports = function(req, res, next) {
               } else {
                 var clientId = optHeaders[config.CLIENT_ID_HEADER];
                 if (clientId) {
-                  if (util.isEnable(req, 'keepClientId')) {
+                  if (!util.isEnable(req, 'keepClientId')) {
                     util.removeClientId(optHeaders);
                   }
                   req.setClientId && req.setClientId(clientId);