diff --git a/lib/routes/pollingRoutes.js b/lib/routes/pollingRoutes.js
index 1434220a..a2ca4847 100644
--- a/lib/routes/pollingRoutes.js
+++ b/lib/routes/pollingRoutes.js
@@ -83,7 +83,7 @@ function poll (req, res, next) {
   const terms = configManager.getTermsConditions(settings.config)
   const enablePaperWalletOnly = configManager.getCompliance(settings.config).enablePaperWalletOnly
 
-  state.pids[operatorId] = { [deviceId]: { pid, ts: Date.now() } }
+  state.pids = _.update(operatorId, _.set(deviceId, { pid, ts: Date.now() }), state.pids)
 
   return Promise.all([pi.pollQueries(serialNumber, deviceTime, req.query, machineVersion, machineModel), triggersPromise, triggersAutomationPromise])
     .then(([results, triggers, triggersAutomation]) => {