diff --git a/files/classes/comment.py b/files/classes/comment.py
index cd5cc8154..1f84077b0 100644
--- a/files/classes/comment.py
+++ b/files/classes/comment.py
@@ -567,4 +567,4 @@ class Comment(Base):
 
 	@lazy
 	def is_saved(self, v):
-		return g.db.query(CommentSaveRelationship).filter_by(user_id=v.id, comment_id=self.id).first()
\ No newline at end of file
+		return g.db.query(CommentSaveRelationship).filter_by(user_id=v.id, comment_id=self.id).one_or_none()
\ No newline at end of file
diff --git a/files/classes/submission.py b/files/classes/submission.py
index 0008b8339..f9c11fc90 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -14,6 +14,7 @@ from .flags import Flag
 from .comment import Comment, normalize_urls_runtime
 from .saves import SaveRelationship
 from .sub import *
+from .subscriptions import *
 from .votes import CommentVote
 from flask import g
 
@@ -507,8 +508,8 @@ class Submission(Base):
 
 	@lazy
 	def is_saved(self, v):
-		return g.db.query(SaveRelationship).filter_by(user_id=v.id, submission_id=self.id).first()
+		return g.db.query(SaveRelationship).filter_by(user_id=v.id, submission_id=self.id).one_or_none()
 
 	@lazy
 	def is_subscribed(self, v):
-		return g.db.query(Subscription).filter_by(user_id=v.id, submission_id=self.id).first()
\ No newline at end of file
+		return g.db.query(Subscription).filter_by(user_id=v.id, submission_id=self.id).one_or_none()
\ No newline at end of file