diff --git a/graph/resolvers/tag_link.js b/graph/resolvers/tag_link.js
index 11ee1350d..2fede45ec 100644
--- a/graph/resolvers/tag_link.js
+++ b/graph/resolvers/tag_link.js
@@ -1,6 +1,6 @@
 const TagLink = {
   assigned_by({assigned_by}, _, {user, loaders: {Users}}) {
-    if (user && user.hasRoles('ADMIN')) {
+    if (user && user.hasRoles('ADMIN') && assigned_by != null) {
       return Users.getByID.load(assigned_by);
     }
   }