diff --git a/lib/liquid/static_registers.rb b/lib/liquid/static_registers.rb
index 0293f5f9..4512c724 100644
--- a/lib/liquid/static_registers.rb
+++ b/lib/liquid/static_registers.rb
@@ -31,7 +31,11 @@ module Liquid
       if @registers.key?(key)
         @registers.fetch(key)
       elsif default != UNDEFINED
-        @static.fetch(key, default, &block)
+        if block_given?
+          @static.fetch(key, &block)
+        else
+          @static.fetch(key, default)
+        end
       else
         @static.fetch(key, &block)
       end