diff --git a/pastabble-frontend/src/lib/components/CodeBlock.svelte b/pastabble-frontend/src/lib/components/CodeBlock.svelte
index d17d5dc..c46b945 100644
--- a/pastabble-frontend/src/lib/components/CodeBlock.svelte
+++ b/pastabble-frontend/src/lib/components/CodeBlock.svelte
@@ -6,23 +6,22 @@
     export let language: string | undefined;
 
     let displayCode: string | undefined;
+    let displayLanguage: string | undefined;
     let showAlert = false;
-    let initial = true;
 
     $: if(code) {
         highlight();
-        initial = false;
     }
 
-    $: if(language) {
-        if(initial || !code) {
-            highlight();
-        }
+    $: if(language !== displayLanguage) {
+        highlight();
     }
 
     function highlight() {
         if(language) {
-            const res = hljs.highlight(language!, code!);
+            const res = hljs.highlight(code!, {
+                language
+            });
             if(!res.errorRaised) {
                 displayCode = res.value;
             }
@@ -33,6 +32,7 @@
                 language = res.language;
             }
         }
+        displayLanguage = language;
     }
 
     async function copy() {