diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index 40293ee5a..de1cbc0d5 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -123,6 +123,8 @@
 			currentMessage =
 				currentMessage.parentId !== null ? history.messages[currentMessage.parentId] : null;
 		}
+
+		// This is most likely causing the performance issue
 		messages = _messages;
 	} else {
 		messages = [];
diff --git a/src/lib/components/chat/Overview.svelte b/src/lib/components/chat/Overview.svelte
index 5d571fcca..16dd5d83c 100644
--- a/src/lib/components/chat/Overview.svelte
+++ b/src/lib/components/chat/Overview.svelte
@@ -58,7 +58,7 @@
 
 		Object.keys(history.messages).forEach((id) => {
 			const message = history.messages[id];
-			const level = message.parentId ? positionMap.get(message.parentId).level + 1 : 0;
+			const level = message.parentId ? (positionMap.get(message.parentId)?.level ?? -1) + 1 : 0;
 			if (!layerWidths[level]) layerWidths[level] = 0;
 
 			positionMap.set(id, {