diff --git a/Changelog.md b/Changelog.md
index bb96678d0..985e18f0c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@
 * Remove tiff support from photos [#7576](https://github.com/diaspora/diaspora/pull/7576)
 * Remove reference from reshares when original post is deleted [#7578](https://github.com/diaspora/diaspora/pull/7578)
 * Merge migrations from before 0.6.0.0 to CreateSchema [#7580](https://github.com/diaspora/diaspora/pull/7580)
+* Remove auto detection of languages with highlightjs [#7591](https://github.com/diaspora/diaspora/pull/7591)
 
 ## Bug fixes
 * Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)
diff --git a/app/assets/javascripts/app/helpers/text_formatter.js b/app/assets/javascripts/app/helpers/text_formatter.js
index 8b104db09..3fc051404 100644
--- a/app/assets/javascripts/app/helpers/text_formatter.js
+++ b/app/assets/javascripts/app/helpers/text_formatter.js
@@ -71,10 +71,6 @@
           } catch (__) {}
         }
 
-        try {
-          return hljs.highlightAuto(str).value;
-        } catch (__) {}
-
         return "";
       }
     });