diff --git a/config/environment.rb b/config/environment.rb
index dc11087dd31..385a96651de 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -7,6 +7,7 @@
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 Haml::Template.options[:format] = :html5
+Haml::Template.options[:escape_html] = true
 # Initialize the rails application
 Diaspora::Application.initialize!