diff --git a/lib/pairing.js b/lib/pairing.js
index c498d266..42171cd3 100644
--- a/lib/pairing.js
+++ b/lib/pairing.js
@@ -20,16 +20,11 @@ function pullToken (token) {
 // TODO new-admin: We should remove all configs related to that device. This can get tricky.
 function unpair (deviceId) {
   return db.tx(t => 
-    t.none(`INSERT INTO
-      unpaired_devices(id, device_id, name, model, paired, unpaired)
-      VALUES (
-        $1,
-        $2,
-        (SELECT name FROM devices WHERE device_id=$2),
-        (SELECT model FROM devices WHERE device_id=$2),
-        (SELECT created FROM devices WHERE device_id=$2),
-        now()
-      )`, [uuid.v4(), deviceId])
+    t.none(`INSERT INTO unpaired_devices(id, device_id, name, model, paired, unpaired)
+      SELECT $1, $2, d.name, d.model, d.created, now()
+      FROM devices d 
+      WHERE device_id=$2`
+    , [uuid.v4(), deviceId])
     .then(() => {
         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])