diff --git a/app/controllers/work_packages/auto_completes_controller.rb b/app/controllers/work_packages/auto_completes_controller.rb
index d7b9368f1a4e..42b7cd180588 100644
--- a/app/controllers/work_packages/auto_completes_controller.rb
+++ b/app/controllers/work_packages/auto_completes_controller.rb
@@ -73,9 +73,7 @@ def wp_hashes_with_string
   def find_project
     project_id = (params[:work_package] && params[:work_package][:project_id]) || params[:project_id]
     return nil unless project_id
-    Project.find(project_id)
-  rescue ActiveRecord::RecordNotFound
-    nil
+    Project.find_by_id(project_id)
   end
 
   def determine_scope