diff --git a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
index aa030882..fb4a8686 100644
--- a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
+++ b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
@@ -50,7 +50,8 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
 
     # Make all block content html_safe
     def content_tag(name, content = nil, options = nil, &block)
-      mark_safe(super(name, mark_safe(content), options, &block))
+      content = mark_safe(content) unless content.is_a?(Hash)
+      mark_safe(super(name, content, options, &block))
     end
 
     def capture_html(*args, &block)