diff --git a/graph/loaders/comments.js b/graph/loaders/comments.js
index 144586064..0b6ad976d 100644
--- a/graph/loaders/comments.js
+++ b/graph/loaders/comments.js
@@ -100,7 +100,7 @@ const getCommentsByQuery = ({user}, {ids, statuses, asset_id, parent_id, author_
     });
   }
 
-  if (user && (user.hasRoles('ADMIN') || user.id === author_id)) {
+  if (user && (user.hasRoles('ADMIN') || user.id === author_id) && author_id != null) {
     comments = comments.where({author_id});
   }