diff --git a/surfsense_web/app/(home)/changelog/page.tsx b/surfsense_web/app/(home)/changelog/page.tsx
index 8d38cb687..c14218dab 100644
--- a/surfsense_web/app/(home)/changelog/page.tsx
+++ b/surfsense_web/app/(home)/changelog/page.tsx
@@ -29,7 +29,7 @@ interface ChangelogPageItem {
 
 export default async function ChangelogPage() {
 	const allPages = source.getPages() as ChangelogPageItem[];
-	const sortedChangelogs = allPages.sort((a, b) => {
+	const sortedChangelogs = allPages.toSorted((a, b) => {
 		const dateA = new Date(a.data.date).getTime();
 		const dateB = new Date(b.data.date).getTime();
 		return dateB - dateA;
diff --git a/surfsense_web/hooks/use-comments-sync.ts b/surfsense_web/hooks/use-comments-sync.ts
index b6a68364d..f8037c656 100644
--- a/surfsense_web/hooks/use-comments-sync.ts
+++ b/surfsense_web/hooks/use-comments-sync.ts
@@ -118,8 +118,9 @@ function transformComments(
 
 	for (const [messageId, group] of byMessage) {
 		const comments: Comment[] = group.topLevel.map((raw) => {
-			const replies = (group.replies.get(raw.id) || [])
-				.sort((a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime())
+			const replies = (group.replies.get(raw.id) ?? []).toSorted(
+				(a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime()
+			)
 				.map((r) => transformReply(r, memberMap, currentUserId, isOwner));
 
 			return {