diff --git a/config/initializers/will_paginate.rb b/config/initializers/will_paginate.rb
index 69626fd72..966b1da5c 100644
--- a/config/initializers/will_paginate.rb
+++ b/config/initializers/will_paginate.rb
@@ -5,7 +5,11 @@ require 'will_paginate/array'
 
 module WillPaginate
   module ActionView
-    def will_paginate(collection = nil, options = { :renderer => WillPaginate::ActionView::LinkRenderer } )
+    def will_paginate(collection = nil, options = {} )
+      options, collection = collection, nil if collection.is_a? Hash
+      # Taken from original will_paginate code to handle if the helper is not passed a collection object.
+      collection ||= infer_collection_from_controller
+      options[:renderer] ||= WillPaginate::ActionView::LinkRenderer
       super.try :html_safe
     end