diff --git a/files/classes/user.py b/files/classes/user.py
index 5487c525f2..a904da9717 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -341,17 +341,17 @@ class User(Base):
 	@property
 	@lazy
 	def unread_notifications(self):
-		return g.db.query(Notification.id).options(lazyload('*')).filter(Notification.user_id == self.id, Notification.read == False)
+		return g.db.query(Notification.id).options(lazyload('*')).filter(Notification.user_id == self.id, Notification.read == False).join(Notification.comment)
 
 	@property
 	@lazy
 	def notifications_count(self):
-		return self.unread_notifications.count()
+		return self.unread_notifications.filter(Comment.is_banned == False, Comment.deleted_utc == 0).count()
 
 	@property
 	@lazy
 	def post_notifications_count(self):
-		return self.unread_notifications.join(Notification.comment).filter(Comment.author_id == AUTOJANNY_ACCOUNT).count()
+		return self.unread_notifications.filter(Comment.author_id == AUTOJANNY_ACCOUNT).count()
 
 
 	@property