diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb
index 6f704ded0..78ef9c9c7 100644
--- a/app/models/time_entry_query.rb
+++ b/app/models/time_entry_query.rb
@@ -144,8 +144,6 @@ class TimeEntryQuery < Query
   def base_scope
     TimeEntry.visible.
       joins(:project, :user).
-      includes(:activity).
-      references(:activity).
       left_join_issue.
       where(statement)
   end
@@ -155,6 +153,9 @@ class TimeEntryQuery < Query
 
     order_option << "#{TimeEntry.table_name}.id ASC"
     base_scope.
+      includes(:activity).
+      references(:activity).
+      where("#{Enumeration.table_name}.project_id = #{TimeEntry.table_name}.project_id").
       order(order_option).
       joins(joins_for_order_statement(order_option.join(',')))
   end