diff --git a/files/routes/comments.py b/files/routes/comments.py
index 87fca25331..b04efac1c5 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -634,7 +634,7 @@ def comment(v):
g.db.flush()
if request.headers.get("Authorization"): return c.json
- return {"comment": render_template("comments.html", v=v, comments=[c], new_comment=True)}
+ return {"comment": render_template("comments.html", v=v, comments=[c])}
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 2671f07150..172bb06511 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -47,18 +47,16 @@
{% if render_replies %}
- {% if new_comment or level<9 or request.path.startswith('/notifications') %}
-
+
+ {% if level<9 or request.path.startswith('/notifications') %}
{% for reply in replies %}
{{single_comment(reply, level=level+1)}}
{% endfor %}
-
- {% elif replies %}
-
- {% endif %}
+ {% endif %}
+
{% endif %}
@@ -554,18 +552,16 @@
{% endif %}
{% if render_replies %}
- {% if new_comment or level<9 or request.path.startswith('/notifications') %}
-
+
+ {% if level<9 or request.path.startswith('/notifications') %}
{% for reply in replies %}
{{single_comment(reply, level=level+1)}}
{% endfor %}
-
- {% elif replies %}
-
- {% endif %}
+ {% endif %}
+
{% if request.path.startswith('/notifications') and c.level == 1 and c.sentto and not c.parent_submission and c.author_id != AUTOJANNY_ID %}
{% if (v and v.admin_level >= 2) and (c.sentto == 2) and not c.author.is_muted %}