diff --git a/src/server.js b/src/server.js
index 48fa5a57..69a7a427 100644
--- a/src/server.js
+++ b/src/server.js
@@ -164,6 +164,16 @@ const server = program => {
       }
 
       if (!authorized || process.env.SHOCK_ENCRYPTION_ECC === 'false') {
+        if (!authorized) {
+          logger.warn(
+            `An unauthorized Device ID is contacting the API: ${deviceId}`
+          )
+          logger.warn(
+            `Authorized Device IDs: ${[...ECC.devicePublicKeys.keys()].join(
+              ', '
+            )}`
+          )
+        }
         args[0] = JSON.stringify(args[0])
         oldSend.apply(res, args)
       }
diff --git a/utils/ECC/index.js b/utils/ECC/index.js
index 37a2f13c..93cf647e 100644
--- a/utils/ECC/index.js
+++ b/utils/ECC/index.js
@@ -13,8 +13,8 @@ const {
   convertBase64ToBuffer
 } = require('./crypto')
 
-const nodeKeyPairs = new Map()
-const devicePublicKeys = new Map()
+export const nodeKeyPairs = new Map()
+export const devicePublicKeys = new Map()
 
 /**
  * @typedef {object} EncryptedMessage