diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 84219b89b..40058b4b9 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -513,7 +513,7 @@ class IssuesController < ApplicationController
   end
 
   def set_issue
-    @issue = Issue.find_by_id(params[:id])
+    @issue = @project.issues.issue_issue.where(project_issues_index: params[:id]).where.not(id: params[:id]).take || @project.issues.issue_issue.find_by_id(params[:id])
     if @issue.blank?
       return render_not_found
     elsif !(@project.is_public || (current_user.present? && (@project.member?(current_user) || current_user&.admin? || (@project.user_id == current_user&.id))))