diff --git a/utils/ECC/socket.js b/utils/ECC/socket.js
index 8f25e9b5..0feed62d 100644
--- a/utils/ECC/socket.js
+++ b/utils/ECC/socket.js
@@ -148,6 +148,10 @@ const encryptedOn = socket => (eventName, callback) => {
  */
 const encryptedCallback = (socket, callback) => async (...args) => {
   try {
+    if (process.env.SHOCK_ENCRYPTION_ECC === 'false') {
+      return callback(...args)
+    }
+
     const deviceId = socket.handshake.auth.encryptionId
 
     if (!deviceId) {