diff --git a/lib/machine-loader.js b/lib/machine-loader.js
index 4276024f..e846b026 100644
--- a/lib/machine-loader.js
+++ b/lib/machine-loader.js
@@ -147,7 +147,7 @@ function getMachineNames (config) {
 function getMachineName (machineId) {
   const sql = 'SELECT name FROM devices WHERE device_id=$1'
   return db.oneOrNone(sql, [machineId])
-    .then(it => it.name)
+    .then(it => it?.name)
 }
 
 function getMachine (machineId, config) {