diff --git a/server/assignments/schema/types.py b/server/assignments/schema/types.py
index 1d85978c..bf5f89dd 100644
--- a/server/assignments/schema/types.py
+++ b/server/assignments/schema/types.py
@@ -21,7 +21,7 @@ class AssignmentNode(DjangoObjectType):
         interfaces = (relay.Node,)
 
     def resolve_submission(self, info, **kwargs):
-        return self.submissions.get(student=info.context.user)
+        return self.submissions.filter(student=info.context.user).first()  #  returns None if it doesn't exist yet
 
     def resolve_submissions(self, info, **kwargs):
         return self.submissions.all()
\ No newline at end of file