diff --git a/lib/liquid/block.rb b/lib/liquid/block.rb
index b3a982e7..e0ad3329 100644
--- a/lib/liquid/block.rb
+++ b/lib/liquid/block.rb
@@ -59,7 +59,7 @@ module Liquid
 
     # @api public
     def new_body
-      BlockBody.new
+      parse_context.new_block_body
     end
 
     # @api public
diff --git a/lib/liquid/document.rb b/lib/liquid/document.rb
index 8338b069..e0818ecc 100644
--- a/lib/liquid/document.rb
+++ b/lib/liquid/document.rb
@@ -48,7 +48,7 @@ module Liquid
     private
 
     def new_body
-      Liquid::BlockBody.new
+      parse_context.new_block_body
     end
   end
 end
diff --git a/lib/liquid/parse_context.rb b/lib/liquid/parse_context.rb
index 83d4e0ff..4724ec22 100644
--- a/lib/liquid/parse_context.rb
+++ b/lib/liquid/parse_context.rb
@@ -19,6 +19,10 @@ module Liquid
       @options[option_key]
     end
 
+    def new_block_body
+      Liquid::BlockBody.new
+    end
+
     def partial=(value)
       @partial = value
       @options = value ? partial_options : @template_options