diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb
index 6f704ded0..8b51e529a 100644
--- a/app/models/time_entry_query.rb
+++ b/app/models/time_entry_query.rb
@@ -147,6 +147,9 @@ class TimeEntryQuery < Query
       includes(:activity).
       references(:activity).
       left_join_issue.
+      where("#{Enumeration.table_name}.project_id = #{TimeEntry.table_name}.project_id" \
+            " AND #{Enumeration.table_name}.project_id = #{Project.table_name}.id" \
+            " OR #{Enumeration.table_name}.project_id IS NULL")
       where(statement)
   end