diff --git a/files/classes/comment.py b/files/classes/comment.py
index 37527e468..c8cf762d7 100644
--- a/files/classes/comment.py
+++ b/files/classes/comment.py
@@ -351,6 +351,8 @@ class Comment(Base):
 	@lazy
 	def total_poll_voted(self, v):
 		if v:
+			if v.id == self.author_id:
+				return True
 			for o in self.options:
 				if o.voted(v): return True
 		return False
diff --git a/files/classes/post.py b/files/classes/post.py
index 7b64e4086..7ea6ad1c0 100644
--- a/files/classes/post.py
+++ b/files/classes/post.py
@@ -284,6 +284,8 @@ class Post(Base):
 	@lazy
 	def total_poll_voted(self, v):
 		if v:
+			if v.id == self.author_id:
+				return True
 			for o in self.options:
 				if o.voted(v): return True
 		return False