diff --git a/lib/middleman/core_extensions/routing.rb b/lib/middleman/core_extensions/routing.rb
index 485425e3..0ec88937 100644
--- a/lib/middleman/core_extensions/routing.rb
+++ b/lib/middleman/core_extensions/routing.rb
@@ -48,9 +48,11 @@ module Middleman::CoreExtensions::Routing
 
       options[:layout] = settings.layout if options[:layout].nil?
 
+      has_block = block_given?
+
       paths.each do |p|
         get(p) do
-          return yield if block_given?
+          instance_eval(&block) if has_block
           process_request(options)
         end
       end