diff --git a/files/classes/submission.py b/files/classes/submission.py
index 8b50b73c2..31e31589a 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -224,6 +224,7 @@ class Submission(Base):
 							   sort=sort,
 							   linked_comment=comment,
 							   comment_info=comment_info,
+							   render_replies=True
 							   )
 
 	@property
diff --git a/files/routes/front.py b/files/routes/front.py
index c115c502f..83e2db895 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -99,12 +99,13 @@ def notifications(v):
 
 
 	return render_template("notifications.html",
-						   v=v,
-						   notifications=listing,
-						   next_exists=next_exists,
-						   page=page,
-						   standalone=True,
-						   is_notification_page=True)
+							v=v,
+							notifications=listing,
+							next_exists=next_exists,
+							page=page,
+							standalone=True,
+							render_replies=True
+						   )
 
 
 
diff --git a/files/templates/comments.html b/files/templates/comments.html
index e7ae0189d..ecea2efbb 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -64,7 +64,7 @@
 				</div>
 
 
-
+	{% if render_replies %} 
 		{% if level<7 %}
 			<div id="replies-of-{{c.id}}" class="">
 				{% set standalone=False %}
@@ -83,6 +83,7 @@
 				<a {% if v %}href="{{c.permalink}}?context=5#context"{% else %}href="/logged_out{{c.permalink}}?context=5#context"{% endif %}>More comments <i class="fas fa-long-arrow-right ml-1"></i></a>
 			</div>
 		{% endif %}
+	{% endif %}
 </div>
 </div>
 
@@ -415,6 +416,7 @@
 		</div>
 
 
+	{% if render_replies %} 
 		{% if level<7 %}
 			<div id="replies-of-{{c.id}}">
 				{% for reply in replies %}
@@ -431,6 +433,7 @@
 				<a {% if v %}href="{{c.permalink}}#context"{% else %}href="/logged_out{{c.permalink}}#context"{% endif %}>More comments <i class="fas fa-long-arrow-right ml-1"></i></a>
 			</div>
 		{% endif %}
+	{% endif %}
 	</div>