diff --git a/files/assets/js/comments.js b/files/assets/js/comments.js
index 966f2c02b..4e7c0a903 100644
--- a/files/assets/js/comments.js
+++ b/files/assets/js/comments.js
@@ -56,4 +56,22 @@ function expandMarkdown(t,id) {
 	let val = t.getElementsByTagName('span')[0]
 	if (val.innerHTML == 'View source') val.innerHTML = 'Hide source'
 	else val.innerHTML = 'View source'
-};
\ No newline at end of file
+};
+
+function commentsAddUnreadIndicator(commentIds) {
+	commentIds.forEach(element => {
+		const commentOnly = document.getElementById(`comment-${element}-only`);
+		if (!commentOnly) { 
+			console.warn(`Couldn't find comment (comment ID ${element}) in page while attempting to add an unread indicator.`);
+			return;
+		}
+		if (commentOnly.classList.contains("unread")) return;
+		commentOnly.classList.add("unread");
+		const commentUserInfo = document.getElementById(`comment-${element}`)?.querySelector(".comment-user-info");
+		if (!commentUserInfo) {
+			console.warn(`Couldn't find comment user info (comment ID ${element}) in page while attempting to add an unread indicator.`);
+			return;
+		}
+		commentUserInfo.innerHTML += "<span class=\"new-indicator\">~new~</span>";
+	});
+}
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 879709ef6..793ec7d87 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -201,23 +201,23 @@
 	<script src="{{ 'js/comments+submission_listing.js' | asset }}"></script>
 	<script src="{{ 'js/comments.js' | asset }}"></script>
 
+	{# See https://github.com/themotte/rDrama/pull/642#issuecomment-1646649781 for info on this section of the code #}
 	<script>
 		{% if p and (not v or v.highlightcomments) %}
 			comments = JSON.parse(localStorage.getItem("comment-counts")) || {}
 			lastCount = comments['{{p.id}}']
-			if (lastCount)
-			{
-				{% for c in p.comments %}
-					{% if not (v and v.id==c.author_id) and not c.voted %}
-						if ({{c.created_utc*1000}} > lastCount.t) 
-						try {
-							document.getElementById("comment-{{c.id}}-only").classList.add('unread')
-							document.getElementById("comment-{{c.id}}").querySelector(".comment-user-info").innerHTML += "<span>~new~</span>";
-						}
-						catch(e) {}
-					{% endif %}
+			var commentsToCheck = [
+				{% for c in p.comments -%}
+					{%- if not (v and v.id==c.author_id) and not c.voted %}
+					[{{c.id}}, {{c.created_utc * 1000}}],
+					{%- endif -%}
 				{% endfor %}
-			}
+			];
+
+			commentsToCheck = commentsToCheck.filter(comment => comment[1] > lastCount.t)
+			                                 .map(comment => comment[0]);
+
+			if (lastCount) commentsAddUnreadIndicator(commentsToCheck);
 		{% endif %}
 
 		{% if p and not (request.values and ('context' in request.values)) %}
@@ -250,19 +250,19 @@
 					{% if p %}
 						comments = JSON.parse(localStorage.getItem("old-comment-counts")) || {}
 						lastCount = comments['{{p.id}}']
-						if (lastCount)
-						{
-							{% for c in p.comments %}
-								{% if not (v and v.id==c.author_id) and not c.voted %}
-									if ({{c.created_utc*1000}} > lastCount.t) 
-									try {
-										document.getElementById("comment-{{c.id}}-only").classList.add('unread')
-										document.getElementById("comment-{{c.id}}").querySelector(".comment-user-info").innerHTML += "<span>~new~</span>";
-									}
-									catch(e) {}
-								{% endif %}
+
+						var commentsToCheck = [
+							{% for c in p.comments -%}
+								{%- if not (v and v.id==c.author_id) and not c.voted %}
+								[{{c.id}}, {{c.created_utc * 1000}}],
+								{%- endif -%}
 							{% endfor %}
-						}
+						];
+
+						commentsToCheck = commentsToCheck.filter(comment => comment[1] > lastCount.t)
+						                                 .map(comment => comment[0]);
+						
+						if (lastCount) commentsAddUnreadIndicator(commentsToCheck);
 					{% endif %}
 				}
 				btn.disabled = false;
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 4a64610fc..fac5b94a6 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -489,19 +489,19 @@
 
 					comments = JSON.parse(localStorage.getItem("old-comment-counts")) || {}
 					lastCount = comments['{{p.id}}']
-					if (lastCount)
-					{
-						{% for c in p.comments %}
+
+					var commentsToCheck = [
+						{% for c in p.comments -%}
 							{% if not (v and v.id==c.author_id) and not c.voted %}
-								if ({{c.created_utc*1000}} > lastCount.t) 
-								try {
-									document.getElementById("comment-{{c.id}}-only").classList.add('unread')
-									document.getElementById("comment-{{c.id}}").querySelector(".comment-user-info").innerHTML += "<span>~new~</span>";
-								}
-								catch(e) {}
-							{% endif %}
+							[{{c.id}}, {{c.created_utc * 1000}}],
+							{%- endif -%}
 						{% endfor %}
-					}
+					];
+
+					commentsToCheck = commentsToCheck.filter(comment => comment[1] > lastCount.t)
+					                                 .map(comment => comment[0]);
+					
+					if (lastCount) commentsAddUnreadIndicator(commentsToCheck);
 
 					collapsedCommentStorageApply();
 				}