diff --git a/apps/client/src/services/library_loader.ts b/apps/client/src/services/library_loader.ts
index a5ad0e3fc..fc1b53f10 100644
--- a/apps/client/src/services/library_loader.ts
+++ b/apps/client/src/services/library_loader.ts
@@ -121,6 +121,5 @@ export default {
     requireCss,
     requireLibrary,
     loadHighlightingTheme,
-    KATEX,
-    HIGHLIGHT_JS
+    KATEX
 };
diff --git a/apps/client/src/services/syntax_highlight.ts b/apps/client/src/services/syntax_highlight.ts
index ae2fbde72..213518d58 100644
--- a/apps/client/src/services/syntax_highlight.ts
+++ b/apps/client/src/services/syntax_highlight.ts
@@ -1,4 +1,4 @@
-import library_loader from "./library_loader.js";
+import { highlight, highlightAuto } from "@triliumnext/highlightjs";
 import mime_types from "./mime_types.js";
 import options from "./options.js";
 
@@ -43,17 +43,13 @@ export async function applySingleBlockSyntaxHighlight($codeBlock: JQuery<HTMLEle
     $codeBlock.parent().toggleClass("hljs");
     const text = $codeBlock.text();
 
-    if (!window.hljs) {
-        await library_loader.requireLibrary(library_loader.HIGHLIGHT_JS);
-    }
-
     let highlightedText = null;
     if (normalizedMimeType === mime_types.MIME_TYPE_AUTO) {
-        highlightedText = hljs.highlightAuto(text);
+        highlightedText = highlightAuto(text);
     } else if (normalizedMimeType) {
         const language = mime_types.getHighlightJsNameForMime(normalizedMimeType);
         if (language) {
-            highlightedText = hljs.highlight(text, { language });
+            highlightedText = highlight(text, { language });
         } else {
             console.warn(`Unknown mime type: ${normalizedMimeType}.`);
         }
diff --git a/apps/client/src/types.d.ts b/apps/client/src/types.d.ts
index 70e51aede..fad0fed16 100644
--- a/apps/client/src/types.d.ts
+++ b/apps/client/src/types.d.ts
@@ -124,13 +124,6 @@ declare global {
     var __non_webpack_require__: RequireMethod | undefined;
 
     // Libraries
-    // TODO: Replace once library loader is replaced with webpack.
-    var hljs: {
-        highlightAuto(text: string);
-        highlight(text: string, {
-            language: string
-        });
-    };
     var renderMathInElement: (element: HTMLElement, options: {
         trust: boolean;
     }) => void;
diff --git a/apps/client/src/widgets/type_widgets/options/text_notes/code_block.ts b/apps/client/src/widgets/type_widgets/options/text_notes/code_block.ts
index 162499274..361a06cd1 100644
--- a/apps/client/src/widgets/type_widgets/options/text_notes/code_block.ts
+++ b/apps/client/src/widgets/type_widgets/options/text_notes/code_block.ts
@@ -91,7 +91,7 @@ export default class CodeBlockOptions extends OptionsWidget {
     #setupPreview(shouldEnableSyntaxHighlight: boolean) {
         const text = SAMPLE_CODE;
         if (shouldEnableSyntaxHighlight) {
-            library_loader.requireLibrary(library_loader.HIGHLIGHT_JS).then(() => {
+            import("@triliumnext/highlightjs").then((hljs) => {
                 const highlightedText = hljs.highlight(text, {
                     language: SAMPLE_LANGUAGE
                 });