diff --git a/src/middleware/passwordMiddleware.js b/src/middleware/passwordMiddleware.js
index 1153d4588..139fcffcf 100644
--- a/src/middleware/passwordMiddleware.js
+++ b/src/middleware/passwordMiddleware.js
@@ -9,7 +9,7 @@ export default {
   },
   Query: async (resolve, root, args, context, info) => {
     const result = await resolve(root, args, context, info)
-    if (result.password) {
+    if (result && result.password) {
       result.password = '*****'
     }
     return result