diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 8305f2e4b..5590d9e87 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -29,9 +29,9 @@ class IssuesController < ApplicationController
     @close_issues = @all_issues.where(status_id: IssueStatus::CLOSED)
     scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "Issue")
     @issues_size = scopes.size
+    @assign_to_me = scopes.where(assigned_to_id: current_user&.id)
+    @my_published = scopes.where(author_id: current_user&.id)
     @issues = paginate(scopes)
-    @assign_to_me = @issues.where(assigned_to_id: current_user&.id)
-    @my_published = @issues.where(author_id: current_user&.id)
 
     respond_to do |format|
       format.json