diff --git a/client/src/components/Messages/Content/Highlight.jsx b/client/src/components/Messages/Content/Highlight.jsx
index 035b860a3e..5a85326534 100644
--- a/client/src/components/Messages/Content/Highlight.jsx
+++ b/client/src/components/Messages/Content/Highlight.jsx
@@ -5,7 +5,7 @@ import { languages } from '~/utils/languages';
 
 const Highlight = React.memo(({ language, code }) => {
   const [highlightedCode, setHighlightedCode] = useState(code);
-  const lang = language ? language : 'javascript';
+  const lang = languages.has(language) ? language : 'javascript';
 
   useEffect(() => {
     setHighlightedCode(hljs.highlight(code, { language: lang }).value);