diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index e32f8b11e0..6b201f1b8e 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -118,6 +118,9 @@ export default class TextualBody extends React.Component {
                 setTimeout(() => {
                     if (this._unmounted) return;
                     for (let i = 0; i < codes.length; i++) {
+                        // If the code already has the hljs class we want to skip this.
+                        // This happens after the codeblock was edited.
+                        if (codes[i].className.includes("hljs")) continue;
                         this._highlightCode(codes[i]);
                     }
                 }, 10);