diff --git a/js/dark_theme.js b/js/dark_theme.js
index f61060cd..7136f5bf 100644
--- a/js/dark_theme.js
+++ b/js/dark_theme.js
@@ -9,8 +9,12 @@ function toggleDarkMode() {
 
   // Re-highlight all code blocks once stylesheet loads
   currentCSS.onload = function() {
-    document.querySelectorAll("pre code").forEach(block => {
-      hljs.highlightElement(block);
+    const messageBodies = document.getElementById("chat").querySelectorAll(".message-body");
+    messageBodies.forEach((messageBody) => {
+      const codeBlocks = messageBody.querySelectorAll("pre code");
+      codeBlocks.forEach((codeBlock) => {
+        hljs.highlightElement(codeBlock);
+      });
     });
   };
 }