diff --git a/files/classes/comment.py b/files/classes/comment.py
index 7b9ab2d20..bbd6300b7 100644
--- a/files/classes/comment.py
+++ b/files/classes/comment.py
@@ -230,12 +230,13 @@ class Comment(CreatedBase):
 			'is_pinned': self.is_pinned,
 			'distinguish_level': self.distinguish_level,
 			'post_id': self.post.id if self.post else 0,
-			'score': self.score,
-			'upvotes': self.upvotes,
-			'downvotes': self.downvotes,
 			'is_bot': self.is_bot,
-			'flags': flags,
 			}
+		
+		if not self.should_hide_score:
+			data['score'] = self.score
+			data['upvotes'] = self.upvotes
+			data['downvotes'] = self.downvotes
 
 		return data
 
diff --git a/files/classes/submission.py b/files/classes/submission.py
index d406aba4b..c894207c0 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -241,15 +241,16 @@ class Submission(CreatedBase):
 				'created_utc': self.created_utc,
 				'edited_utc': self.edited_utc or 0,
 				'comment_count': self.comment_count,
-				'score': self.score,
-				'upvotes': self.upvotes,
-				'downvotes': self.downvotes,
 				'stickied': self.stickied,
 				'private' : self.private,
 				'distinguish_level': self.distinguish_level,
 				'voted': self.voted if hasattr(self, 'voted') else 0,
-				'flags': flags,
 				}
+		
+		if not self.should_hide_score:
+			data['score'] = self.score
+			data['upvotes'] = self.upvotes
+			data['downvotes'] = self.downvotes
 
 		return data