diff --git a/services/web/app/coffee/Features/Project/ProjectLocator.coffee b/services/web/app/coffee/Features/Project/ProjectLocator.coffee
index fe60e0ba3e..9486210059 100644
--- a/services/web/app/coffee/Features/Project/ProjectLocator.coffee
+++ b/services/web/app/coffee/Features/Project/ProjectLocator.coffee
@@ -1,4 +1,5 @@
 Project = require('../../models/Project').Project
+ProjectGetter = require("./ProjectGetter")
 Errors = require "../../errors"
 _ = require('underscore')
 logger = require('logger-sharelatex')
@@ -50,7 +51,7 @@ module.exports =
 		if project?
 			startSearch(project)
 		else
-			Project.findById project_id, (err, project)->
+			ProjectGetter.getProject project_id, (err, project)->
 				return callback(err) if err?
 				if !project?
 					return callback(new Errors.NotFoundError("project not found"))
diff --git a/services/web/test/UnitTests/coffee/Project/ProjectLocatorTests.coffee b/services/web/test/UnitTests/coffee/Project/ProjectLocatorTests.coffee
index 5c36c18493..c7b4060a51 100644
--- a/services/web/test/UnitTests/coffee/Project/ProjectLocatorTests.coffee
+++ b/services/web/test/UnitTests/coffee/Project/ProjectLocatorTests.coffee
@@ -30,7 +30,7 @@ project.rootFolder[0] = rootFolder
 project.rootDoc_id = rootDoc._id
 
 
-describe 'project model', ->
+describe 'ProjectLocatorTests', ->
 
 	beforeEach ->
 		Project.getProject = (project_id, fields, callback)=>
@@ -38,9 +38,12 @@ describe 'project model', ->
 
 		Project.findById = (project_id, callback)=>
 			callback(null, project)
+		@ProjectGetter = 
+			getProject: sinon.stub().callsArgWith(1, null, project)
 		@locator = SandboxedModule.require modulePath, requires:
 			'../../models/Project':{Project:Project}
 			'../../models/User':{User:@User}
+			"./ProjectGetter":@ProjectGetter
 			'logger-sharelatex':
 				log:->
 				err:->