diff --git a/.gitignore b/.gitignore
index a08a226..abf8ef0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@
 /logs/
 *.swp
 *.sqlite
-
+/chips.json
diff --git a/lib/partner-mkios.js b/lib/partner-mkios.js
index 5199658..45ab8f4 100644
--- a/lib/partner-mkios.js
+++ b/lib/partner-mkios.js
@@ -1,5 +1,6 @@
 "use strict";
 
+const fs = require('fs');
 const moment = require('moment');
 
 const Modem = require('./modem');
@@ -12,6 +13,9 @@ const matrix = require('komodo-sdk/matrix');
 
 const modemDashboard = require('./modem-dashboard');
 
+const chipsJsonFile = process.cwd() + '/chips.json';
+const chips = fs.existsSync(chipsJsonFile) ? require(chipsJsonFile) : {};
+
 if (config && config.debug_modem) {
     process.env.KOMODO_DEBUG_MODEM=1;
 }
@@ -324,11 +328,7 @@ function report(data) {
             data.message = 'CHIP-IMSI: ' + matrix.modem.imsi + '; ' + data.message;
         }
 
-        let msisdn = config.partner.msisdn;
-        if (msisdn && (typeof msisdn === 'object')) {
-            msisdn = msisdn[matrix.modem.imsi];
-        }
-
+        const msisdn = chips && chips.by_imsi && chips.by_imsi[imsi] && chips.by_imsi[imsi].msisdn ? chips.by_imsi[imsi].msisdn : config.partner.msisdn;
         if (msisdn) {
             data.message = 'CHIP-MSISDN: ' + msisdn + '; ' + data.message;
         }