diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb
index b0a0bee1c81ddbafdea3c2c1099f44fe41e2128b..71b8f4f452ed99420a5b4a57e07bbaa0c6f42e6f 100644
--- a/lib/gitlab/project_search_results.rb
+++ b/lib/gitlab/project_search_results.rb
@@ -2,19 +2,13 @@ module Gitlab
   class ProjectSearchResults < SearchResults
     attr_reader :project, :repository_ref
 
-    def initialize(project_id, query, scope = nil, page = nil, repository_ref = nil)
+    def initialize(project_id, query, repository_ref = nil)
       @project = Project.find(project_id)
       @repository_ref = repository_ref
-      @page = page
       @query = Shellwords.shellescape(query) if query.present?
-      @scope = scope
-
-      unless %w(blobs notes issues merge_requests).include?(@scope)
-        @scope = default_scope
-      end
     end
 
-    def objects
+    def objects(scope, page)
       case scope
       when 'notes'
         notes.page(page).per(per_page)
@@ -51,10 +45,6 @@ module Gitlab
       Note.where(project_id: limit_project_ids).search(query).order('updated_at DESC')
     end
 
-    def default_scope
-      'blobs'
-    end
-
     def limit_project_ids
       [project.id]
     end
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb
index 1325d542a0f8c2612619c9c1174f0e7eaa3feaa2..57b2ad887e3169fb60fc24267fa216ceff1a3ef5 100644
--- a/lib/gitlab/search_results.rb
+++ b/lib/gitlab/search_results.rb
@@ -1,23 +1,17 @@
 module Gitlab
   class SearchResults
-    attr_reader :scope, :objects, :query, :page
+    attr_reader :query
 
     # Limit search results by passed project ids
     # It allows us to search only for projects user has access to
     attr_reader :limit_project_ids
 
-    def initialize(limit_project_ids, query, scope = nil, page = nil)
+    def initialize(limit_project_ids, query)
       @limit_project_ids = limit_project_ids || Project.all
-      @page = page
       @query = Shellwords.shellescape(query) if query.present?
-      @scope = scope
-
-      unless %w(projects issues merge_requests).include?(@scope)
-        @scope = default_scope
-      end
     end
 
-    def objects
+    def objects(scope, page)
       case scope
       when 'projects'
         projects.page(page).per(per_page)