diff --git a/server/books/schema/nodes/snapshot.py b/server/books/schema/nodes/snapshot.py
index 3aac2ecf..53707b9e 100644
--- a/server/books/schema/nodes/snapshot.py
+++ b/server/books/schema/nodes/snapshot.py
@@ -168,7 +168,7 @@ class SnapshotNode(DjangoObjectType):
 
     @staticmethod
     def resolve_creator(parent, info, **kwargs):
-        return f'{parent.creator.first_name} {parent.creator.last_name}'
+        return f'{parent.creator.first_name} {parent.creator.last_name}' if parent.creator else ''
 
     @staticmethod
     def resolve_objective_groups(parent, info, **kwargs):
diff --git a/server/books/tests/test_snapshots.py b/server/books/tests/test_snapshots.py
index 0813448b..febabb84 100644
--- a/server/books/tests/test_snapshots.py
+++ b/server/books/tests/test_snapshots.py
@@ -414,3 +414,13 @@ class SnapshotTestCase(SkillboxTestCase):
             }
         })
         self.assertIsNotNone(result.get('errors'))
+
+    def test_snapshot_without_creator(self):
+        self.snapshot.creator = None
+        self.snapshot.shared = True
+        self.snapshot.save()
+        result = self.client.execute(MODULE_SNAPSHOTS_QUERY, variables={
+            "slug": self.slug
+        })
+        self.assertIsNone(result.get('errors'))
+        self.assertEqual(len(result.get('data').get('module').get('snapshots')), 1)