diff --git a/Gemfile b/Gemfile
index 2eaef7d5..5cf0584a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ gem "devise-i18n"
 gem "fog-aws"
 gem "fog-core"
 gem "fog-local"
-gem "haml", "~> 5.0"
+gem "haml", "~> 6.0"
 gem "hcaptcha", "~> 7.0"
 gem "mini_magick"
 gem "oj"
diff --git a/Gemfile.lock b/Gemfile.lock
index 892228c4..cd5ebf12 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -213,8 +213,9 @@ GEM
       guard (>= 2.0.0)
       guard-compat (~> 1.0)
     guard-compat (1.2.1)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+    haml (6.0.7)
+      temple (>= 0.8.2)
+      thor
       tilt
     haml_lint (0.42.0)
       haml (>= 4.0, < 6.1)
@@ -512,7 +513,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sysexits (1.2.0)
-    temple (0.8.2)
+    temple (0.9.1)
     thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.11)
@@ -594,7 +595,7 @@ DEPENDENCIES
   fog-core
   fog-local
   guard-brakeman
-  haml (~> 5.0)
+  haml (~> 6.0)
   haml_lint
   hcaptcha (~> 7.0)
   httparty
diff --git a/app/helpers/layouts_helper.rb b/app/helpers/layouts_helper.rb
index cc924fae..e9025c2b 100644
--- a/app/helpers/layouts_helper.rb
+++ b/app/helpers/layouts_helper.rb
@@ -4,7 +4,6 @@ module LayoutsHelper
   def parent_layout(layout)
     @view_flow.set(:layout, output_buffer)
     output = render(template: "layouts/#{layout}")
-    @haml_buffer.buffer.replace output
     self.output_buffer = ActionView::OutputBuffer.new(output)
   end
 end