diff --git a/lib/new-admin/graphql/resolvers/customer.resolver.js b/lib/new-admin/graphql/resolvers/customer.resolver.js
index d8bcac55..98d40d44 100644
--- a/lib/new-admin/graphql/resolvers/customer.resolver.js
+++ b/lib/new-admin/graphql/resolvers/customer.resolver.js
@@ -5,12 +5,9 @@ const filters = require('../../filters')
 const customerNotes = require('../../../customer-notes')
 const machineLoader = require('../../../machine-loader')
 
-const getCustomerById = customerId =>
-  customers.getCustomerById(customerId)
-    .then(customer =>
-      machineLoader.getMachineName(customer.lastUsedMachine)
-        .then(lastUsedMachineName => Object.assign(customer, { lastUsedMachineName }))
-    )
+const addLastUsedMachineName = customer =>
+  (customer.lastUsedMachine ? machineLoader.getMachineName(customer.lastUsedMachine) : Promise.resolve(null))
+    .then(lastUsedMachineName => Object.assign(customer, { lastUsedMachineName }))
 
 const resolvers = {
   Customer: {
@@ -18,7 +15,7 @@ const resolvers = {
   },
   Query: {
     customers: (...[, { phone, email, name, address, id }]) => customers.getCustomersList(phone, name, address, id, email),
-    customer: (...[, { customerId }]) => getCustomerById(customerId),
+    customer: (...[, { customerId }]) => customers.getCustomerById(customerId).then(addLastUsedMachineName),
     customerFilters: () => filters.customer()
   },
   Mutation: {