diff --git a/files/templates/comments.html b/files/templates/comments.html
index 3875c0c21d..357e7e6e6a 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -9,6 +9,8 @@
 	<script src="/assets/js/comments_admin.js"></script>
 {% endif %}
 
+{% include 'embeds/new_comments_count.html' %}
+
 <script>
 
 	function collapse_comment(comment_id) {
diff --git a/files/templates/default.html b/files/templates/default.html
index e529de311c..c9a47a38dd 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -68,50 +68,6 @@
 	{% if v %}
 		<script src="https://js.pusher.com/beams/1.0/push-notifications-cdn.js"></script>
 		<script src="/assets/js/default.js"></script>
-		<script>
-		// New comment counts
-
-		// localstorage comment counts format: {"<postId>": {c: <totalComments>, t: <timestampUpdated>}}
-		const COMMENT_COUNTS_ID = "comment-counts"
-
-		/**
-		 * Display the number of new comments present since the last time the post was opened
-		 */
-		function showNewCommentCounts(postId, newTotal) {
-			const comments = JSON.parse(localStorage.getItem(COMMENT_COUNTS_ID)) || {}
-
-			const lastCount = comments[postId]
-			if (lastCount) {
-				const newComments = newTotal - lastCount.c
-				if (newComments > 0) {
-					document.querySelectorAll(`#post-${postId} .new-comments`).forEach(elem => {
-						elem.textContent = ` (+${newComments})`
-						elem.classList.remove("d-none")
-					})
-				}
-			}
-		}
-
-		function incrementCommentCount(postId) {
-			saveCommentsCount(postId)
-		}
-
-		/**
-		 * Saves the comment count to the localStorage
-		 *
-		 * @param postId The id of the post associated with the comments
-		 * @param lastTotalComs The new amount, If null it will just increment the previous amount
-		 */
-		function saveCommentsCount(postId, lastTotalComs = null) {
-			const comments = JSON.parse(localStorage.getItem(COMMENT_COUNTS_ID)) || {}
-
-			const newTotal = lastTotalComs || ((comments[postId] || { c: 0 }).c + 1)
-
-			comments[postId] = { c: newTotal, t: Date.now() }
-
-			window.localStorage.setItem(COMMENT_COUNTS_ID, JSON.stringify(comments))
-		}
-		</script>
 	{% endif %}
 
 
diff --git a/files/templates/embeds/new_comments_count.html b/files/templates/embeds/new_comments_count.html
new file mode 100644
index 0000000000..c2adf6acb1
--- /dev/null
+++ b/files/templates/embeds/new_comments_count.html
@@ -0,0 +1,80 @@
+<script>
+
+	// only allows the script to execute once
+	if (typeof showNewCommentCounts === 'undefined') {
+
+		// localstorage comment counts format: {"<postId>": {c: <totalComments>, t: <timestampUpdated>}}
+		const COMMENT_COUNTS_ID = "comment-counts"
+
+		/**
+		 * Display the number of new comments present since the last time the post was opened
+		 */
+		function showNewCommentCounts(postId, newTotal) {
+			const comments = JSON.parse(localStorage.getItem(COMMENT_COUNTS_ID)) || {}
+
+			const lastCount = comments[postId]
+			if (lastCount) {
+				const newComments = newTotal - lastCount.c
+				if (newComments > 0) {
+					document.querySelectorAll(`#post-${postId} .new-comments`).forEach(elem => {
+						elem.textContent = ` (+${newComments})`
+						elem.classList.remove("d-none")
+					})
+				}
+			}
+		}
+
+		function incrementCommentCount(postId) {
+			saveCommentsCount(postId)
+		}
+
+		/**
+		 * Saves the comment count to the localStorage
+		 *
+		 * @param postId The id of the post associated with the comments
+		 * @param lastTotalComs The new amount, If null it will just increment the previous amount
+		 */
+		function saveCommentsCount(postId, lastTotalComs = null) {
+			const comments = JSON.parse(localStorage.getItem(COMMENT_COUNTS_ID)) || {}
+
+			const newTotal = lastTotalComs || ((comments[postId] || { c: 0 }).c + 1)
+
+			comments[postId] = { c: newTotal, t: Date.now() }
+
+			window.localStorage.setItem(COMMENT_COUNTS_ID, JSON.stringify(comments))
+		}
+
+
+		/**
+		 * Cleans the expired entries (5 days). It runs every hour.
+		 */
+		function cleanCommentsCache() {
+			const LAST_CACHE_CLEAN_ID = "last-cache-clean"
+			const EXPIRE_INTERVAL_MILLIS = 5 * 24 * 60 * 60 * 1000
+			const CACHE_CLEAN_INTERVAL = 60 * 60 * 1000 // 1 hour
+
+			function cleanCache() {
+				const lastCacheClean = JSON.parse(localStorage.getItem(LAST_CACHE_CLEAN_ID)) || Date.now()
+				const now = Date.now()
+
+				if (now - lastCacheClean > CACHE_CLEAN_INTERVAL) {
+					const comments = JSON.parse(localStorage.getItem(COMMENT_COUNTS_ID)) || {}
+
+					for (let [key, value] of Object.entries(comments)) {
+						if (now - value.t > EXPIRE_INTERVAL_MILLIS) {
+							delete comments[key]
+						}
+					}
+					window.localStorage.setItem(COMMENT_COUNTS_ID, JSON.stringify(comments))
+				}
+				window.localStorage.setItem(LAST_CACHE_CLEAN_ID, JSON.stringify(now))
+			}
+
+			// So it does not slow the load of the main page with the clean up
+			setTimeout(cleanCache, 500)
+		}
+
+		cleanCommentsCache()
+
+	}
+</script>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index e639c5d6f4..3585c3535d 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -64,6 +64,8 @@
 	</script>
 {% endif %}
 
+{% include 'embeds/new_comments_count.html' %}
+
 <meta charset="utf-8" />
 <meta property="og:type" content="article" />
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 365d203a2e..209f341af5 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -15,6 +15,8 @@
 	});
 </script>
 
+{% include 'embeds/new_comments_count.html' %}
+
 {% for p in listing %}
 
 {% set ups=p.upvotes %}