diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder
index 2c17dcca6..07c4b322b 100644
--- a/app/views/pull_requests/index.json.jbuilder
+++ b/app/views/pull_requests/index.json.jbuilder
@@ -23,10 +23,10 @@ json.issues do
     json.pull_request_base pr.base
     json.pull_request_staus pr.status == 1 ? "merged" : (pr.status == 2 ? "closed" : "open")
     json.is_original pr.is_original
-    json.fork_project_id pr&.fork_project_id
-    json.fork_project_identifier pr&.fork_project&.identifier
-    json.fork_project_user pr&.fork_project&.owner.try(:login)
-    json.fork_project_user_name pr&.fork_project&.owner.try(:show_real_name)
+    json.fork_project_id pr.fork_project_id.present? ? pr.fork_project_id : pr.project_id
+    json.fork_project_identifier pr.fork_project_id.present? ? pr&.fork_project&.identifier : pr.project&.identifier
+    json.fork_project_user pr.fork_project_id.present? ? pr&.fork_project&.owner.try(:login) : pr.project&.owner.try(:login)
+    json.fork_project_user_name pr.fork_project_id.present? ? pr&.fork_project&.owner.try(:show_real_name) : pr.project&.owner.try(:show_real_name)
     json.reviewers pr.reviewers.pluck(:login)
 
     json.id issue.id
diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder
index b316043a7..4c731b9ac 100644
--- a/app/views/pull_requests/show.json.jbuilder
+++ b/app/views/pull_requests/show.json.jbuilder
@@ -23,8 +23,9 @@ if @last_review.present?
 end
 
 json.pull_request do
-  json.extract! @pull_request, :id,:base, :head, :status,:fork_project_id, :is_original
+  json.extract! @pull_request, :id,:base, :head, :status, :is_original
   json.pull_request_staus @pull_request.status == 1 ? "merged" : (@pull_request.status == 2 ? "closed" : "open")
+  json.fork_project_id @pull_request.fork_project_id.present? ? @pull_request.fork_project_id : @pull_request.project_id
   json.fork_project_user @pull_request.fork_project_id.present? ? @pull_request&.fork_project&.owner.try(:login) : @pull_request.project&.owner.try(:login)
   json.fork_project_user_name @pull_request.fork_project_id.present? ? @pull_request&.fork_project&.owner.try(:show_real_name) : @pull_request.project&.owner.try(:show_real_name)
   json.create_user @pull_request&.user&.login