1 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/content_editor/services/code_block_language_loader.js b/app/assets/javascripts/content_editor/services/code_block_language_loader.js
index 74018d7e1e3..0d5a8c91907 100644
--- a/app/assets/javascripts/content_editor/services/code_block_language_loader.js
+++ b/app/assets/javascripts/content_editor/services/code_block_language_loader.js
@@ -1,6 +1,7 @@
 import { lowlight } from 'lowlight/lib/core';
 import { __, sprintf } from '~/locale';
 import CODE_BLOCK_LANGUAGES from '../constants/code_block_languages';
+import languageLoader from './highlight_js_language_loader';
 
 const codeBlockLanguageLoader = {
   lowlight,
@@ -46,11 +47,11 @@ const codeBlockLanguageLoader = {
 
   loadLanguages(languageList = []) {
     const loaders = languageList
-      .filter((languageName) => !this.isLanguageLoaded(languageName))
+      .filter(
+        (languageName) => !this.isLanguageLoaded(languageName) && languageName in languageLoader,
+      )
       .map((languageName) => {
-        return import(
-          /* webpackChunkName: 'highlight.language.js' */ `highlight.js/lib/languages/${languageName}`
-        )
+        return languageLoader[languageName]()
           .then(({ default: language }) => {
             this.lowlight.registerLanguage(languageName, language);
           })