diff --git a/lib/plugins.js b/lib/plugins.js
index fb05d049..ca07d516 100644
--- a/lib/plugins.js
+++ b/lib/plugins.js
@@ -226,7 +226,7 @@ function plugins (settings, deviceId) {
     }
   }
 
-  function pollQueries (deviceTime, deviceRec, machineVersion, machineModel) {
+  function pollQueries () {
     const localeConfig = configManager.getLocale(deviceId, settings.config)
     const fiatCode = localeConfig.fiatCurrency
     const cryptoCodes = localeConfig.cryptoCurrencies
@@ -238,7 +238,6 @@ function plugins (settings, deviceId) {
 
     return Promise.all([
       buildAvailableCassettes(),
-      recordPing(deviceTime, machineVersion, machineModel),
       fetchCurrentConfigVersion(),
       millisecondsToMinutes(getTimezoneOffset(localeConfig.timezone)),
       loyalty.getNumberOfAvailablePromoCodes(),
@@ -249,7 +248,6 @@ function plugins (settings, deviceId) {
     ])
       .then(([
         cassettes,
-        _pingRes,
         configVersion,
         timezone,
         numberOfAvailablePromoCodes,
@@ -851,6 +849,7 @@ function plugins (settings, deviceId) {
 
   return {
     getRates,
+    recordPing,
     buildRates,
     getRawRates,
     buildRatesNoCommission,
diff --git a/lib/routes/pollingRoutes.js b/lib/routes/pollingRoutes.js
index 812b376f..89e7aab1 100644
--- a/lib/routes/pollingRoutes.js
+++ b/lib/routes/pollingRoutes.js
@@ -82,11 +82,12 @@ function poll (req, res, next) {
   state.pids = _.update(operatorId, _.set(deviceId, { pid, ts: Date.now() }), state.pids)
 
   return Promise.all([
-      pi.pollQueries(deviceTime, req.query, machineVersion, machineModel),
+      pi.recordPing(deviceTime, machineVersion, machineModel),
+      pi.pollQueries(),
       buildTriggers(configManager.getTriggers(settings.config)),
       configManager.getTriggersAutomation(settings.config)
     ])
-    .then(([results, triggers, triggersAutomation]) => {
+    .then(([_pingRes, results, triggers, triggersAutomation]) => {
       const reboot = pid && state.reboots?.[operatorId]?.[deviceId] === pid
       const shutdown = pid && state.shutdowns?.[operatorId]?.[deviceId] === pid
       const restartServices = pid && state.restartServicesMap?.[operatorId]?.[deviceId] === pid