diff --git a/lib/pairing.js b/lib/pairing.js
index fdfa52a8..56b290d1 100644
--- a/lib/pairing.js
+++ b/lib/pairing.js
@@ -14,11 +14,12 @@ function pullToken (token) {
 
 function unpair (deviceId) {
   // TODO new-admin: We should remove all configs related to that device. This can get tricky.
-  return db.tx(async t => {
-    await t.none('DELETE FROM devices WHERE device_id=$1', [deviceId])
-    await t.none('DELETE FROM machine_pings WHERE device_id=$1', [deviceId])
-    await t.none('DELETE FROM machine_network_heartbeat WHERE device_id=$1', [deviceId])
-    await t.none('DELETE FROM machine_network_performance WHERE device_id=$1', [deviceId])
+  return db.tx(t => {
+    const q1 = t.none('DELETE FROM devices WHERE device_id=$1', [deviceId])
+    const q2 = t.none('DELETE FROM machine_pings WHERE device_id=$1', [deviceId])
+    const q3 = t.none('DELETE FROM machine_network_heartbeat WHERE device_id=$1', [deviceId])
+    const q4 = t.none('DELETE FROM machine_network_performance WHERE device_id=$1', [deviceId])
+    return Promise.all([q1, q2, q3, q4])
   })
 }