diff --git a/files/classes/user.py b/files/classes/user.py
index 1eaf667fe..4ffd8d4a4 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -350,6 +350,7 @@ class User(Base, Stndrd, Age_times):
 		return self.notifications.filter(Notification.read == False).join(Notification.comment).filter(
 			Comment.author_id == AUTOJANNY_ACCOUNT).count()
 
+	@lazy
 	def notification_subscriptions(self, page=1, all_=False):
 
 		notifications = self.notifications.join(Notification.comment).filter(Comment.author_id == AUTOJANNY_ACCOUNT)
@@ -368,6 +369,7 @@ class User(Base, Stndrd, Age_times):
 
 		return output
 
+	@lazy
 	def notification_commentlisting(self, page=1, all_=False):
 
 		notifications = self.notifications.join(Notification.comment).filter(
diff --git a/files/routes/front.py b/files/routes/front.py
index 430405c65..5e5bdc153 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -24,7 +24,7 @@ def notifications(v):
 	messages = request.args.get('messages', False)
 	posts = request.args.get('posts', False)
 	if messages:
-		if v.admin_level == 6: comments = g.db.query(Comment).filter(or_(Comment.author_id==v.id, Comment.sentto==v.id, Comment.sentto==0)).filter(Comment.parent_submission == None).order_by(Comment.created_utc.desc()).offset(25 * (page - 1)).limit(26).all()
+		if v.admin_level == 6: comments = g.db.query(Comment).filter(Comment.child_comments is None, or_(Comment.author_id==v.id, Comment.sentto==v.id, Comment.sentto==0)).filter(Comment.parent_submission == None).order_by(Comment.created_utc.desc()).offset(25 * (page - 1)).limit(26).all()
 		else: comments = g.db.query(Comment).filter(or_(Comment.author_id==v.id, Comment.sentto==v.id)).filter(Comment.parent_submission == None).order_by(Comment.created_utc.desc()).offset(25 * (page - 1)).limit(26).all()
 		next_exists = (len(comments) == 26)
 		comments = comments[:25]