diff --git a/lib/plugins.js b/lib/plugins.js
index 6cb90db2..9a297a46 100644
--- a/lib/plugins.js
+++ b/lib/plugins.js
@@ -231,14 +231,20 @@ function plugins (settings, deviceId) {
   }
 
   function recordPing (serialNumber, deviceTime, rec) {
-    const r = {
+    const machinePings = {
       id: uuid.v4(),
       device_id: deviceId,
       serial_number: serialNumber,
       device_time: deviceTime
     }
+    const devices = {
+      last_online: deviceTime
+    }
 
-    return db.none(pgp.helpers.insert(r, null, 'machine_pings'))
+    return Promise.all([
+      db.none(pgp.helpers.insert(machinePings, null, 'machine_pings')),
+      db.none(pgp.helpers.update(devices, null, 'devices') + 'WHERE device_id = ${deviceId}', { deviceId })
+    ])
   }
 
   function isHd (tx) {