diff --git a/Changelog.md b/Changelog.md
index 1e939f5808886eae160f968e44fa9747993bab04..4fe0620b90a64eab4650d26837fb52dbf190388b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -17,6 +17,7 @@
 * Fix conversations view with no contacts [#6266](https://github.com/diaspora/diaspora/pull/6266)
 * Links in the left sidebar are now clickable on full width [#6267](https://github.com/diaspora/diaspora/pull/6267)
 * Guard against passing nil into person\_image\_tag [#6286](https://github.com/diaspora/diaspora/pull/6286)
+* Prevent Handlebars from messing up indentation of pre tags [#6339](https://github.com/diaspora/diaspora/pull/6339)
 
 ## Features
 
diff --git a/config/initializers/handlebars_assets.rb b/config/initializers/handlebars_assets.rb
new file mode 100644
index 0000000000000000000000000000000000000000..94bf58554c8d66b21de9ee725654f18e23ccdac0
--- /dev/null
+++ b/config/initializers/handlebars_assets.rb
@@ -0,0 +1 @@
+HandlebarsAssets::Config.options = {preventIndent: true}