diff --git a/files/templates/submission.html b/files/templates/submission.html
index 0f99ce95e..4e958d3d1 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -34,24 +34,6 @@
 	</script>
 {% endif %}
 
-<script>
-    // closure to avoid variable conflicts
-    (() => {
-        const date = new Date('{{p.created_datetime}}');
-        document.getElementById('timestamp').title = date.toString();
-        {% if p.edited_utc %}
-            const dateEdited = new Date('{{p.edited_datetime}}');
-            document.getElementById('edited_timestamp').title = dateEdited.toString();
-        {% endif %}
-
-        {% if (not v or v.highlightcomments) %}
-            showNewCommentCounts('{{p.id}}', {{p.comment_count}})
-        {% endif %}
-        saveCommentsCount('{{p.id}}', {{p.comment_count}})
-    })()
-
-</script>
-
 {% if p.award_count("shit") %}
 	<script src="/assets/js/bug-min.js"></script>
 	{% set minbugs = 10*p.award_count("shit") if p.award_count("shit") < 3 else 20 %}
@@ -710,4 +692,24 @@
 	{% include "report_post_modal.html" %}
 {% endif %}
 
+<script>
+	(() => {
+		const date = new Date('{{p.created_datetime}}');
+		document.getElementById('timestamp').title = date.toString();
+		{% if p.edited_utc %}
+			const dateEdited = new Date('{{p.edited_datetime}}');
+			document.getElementById('edited_timestamp').title = dateEdited.toString();
+		{% endif %}
+
+		{% if (not v or v.highlightcomments) %}
+			showNewCommentCounts('{{p.id}}', {{p.comment_count}})
+		{% endif %}
+
+		const comments = JSON.parse(localStorage.getItem("comment-counts")) || {}
+		const newTotal = {{p.comment_count}} || ((comments['{{p.id}}'] || { c: 0 }).c + 1)
+		comments['{{p.id}}'] = { c: newTotal, t: Date.now() }
+		window.localStorage.setItem("comment-counts", JSON.stringify(comments))
+	})()
+</script>
+
 {% endblock %}
\ No newline at end of file