diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f46945f80..b4fd3e3b4 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -94,7 +94,7 @@ class ProjectsController < ApplicationController
   end
 
   def fork_users
-    fork_users = @project.fork_users.includes(:user, :project).order("fork_users.created_at desc").distinct
+    fork_users = @project.fork_users.includes(:user, :project, :fork_project).order("fork_users.created_at desc").distinct
     @forks_count = fork_users.size
     @fork_users = paginate(fork_users)
   end
diff --git a/app/models/fork_user.rb b/app/models/fork_user.rb
index 4a4d5f77e..749f74980 100644
--- a/app/models/fork_user.rb
+++ b/app/models/fork_user.rb
@@ -1,6 +1,6 @@
 class ForkUser < ApplicationRecord
   belongs_to :project
   belongs_to :user
-  belongs_to :fork_project, class_name: 'ForkUser', foreign_key: :fork_project_id
+  belongs_to :fork_project, class_name: 'Project', foreign_key: :fork_project_id
 
 end
diff --git a/app/views/projects/fork_users.json.jbuilder b/app/views/projects/fork_users.json.jbuilder
index 3feb31edb..a539797e7 100644
--- a/app/views/projects/fork_users.json.jbuilder
+++ b/app/views/projects/fork_users.json.jbuilder
@@ -2,10 +2,9 @@ json.count @forks_count
 json.users do
   json.array! @fork_users.each do |f|
     user = f.user
-    fork_project = Project.select(:id,:name, :identifier).find_by(id: f.fork_project_id)
-    json.id f.fork_project_id
-    json.identifier fork_project.identifier
-    json.name "#{user.try(:show_real_name)}/#{fork_project.try(:name)}"
+    json.id f.fork_project.id
+    json.identifier f.fork_project.identifier
+    json.name "#{user.try(:show_real_name)}/#{f.fork_project.try(:name)}"
     json.login user.try(:login)
     json.image_url url_to_avatar(user)
     json.format_time f.created_at.strftime("%Y-%m-%d")