diff --git a/api/export_pr_test.go b/api/export_pr_test.go
index 1f310693e68..ec7b002498c 100644
--- a/api/export_pr_test.go
+++ b/api/export_pr_test.go
@@ -107,6 +107,32 @@ func TestIssue_ExportData(t *testing.T) {
 				}
 			`),
 		},
+		{
+			name:   "assignees",
+			fields: []string{"assignees"},
+			inputJSON: heredoc.Doc(`
+				{ "assignees": { "nodes": [
+					{
+						"id": "MDQ6VXNlcjE=",
+						"login": "monalisa",
+						"name": "Mona Lisa",
+						"databaseId": 1234
+					}
+				] } }
+			`),
+			outputJSON: heredoc.Doc(`
+				{
+					"assignees": [
+						{
+							"id": "MDQ6VXNlcjE=",
+							"login": "monalisa",
+							"name": "Mona Lisa",
+							"databaseId": 1234
+						}
+					]
+				}
+			`),
+		},
 		{
 			name:   "linked pull requests",
 			fields: []string{"closedByPullRequestsReferences"},
@@ -316,6 +342,32 @@ func TestPullRequest_ExportData(t *testing.T) {
 				}
 			`),
 		},
+		{
+			name:   "assignees",
+			fields: []string{"assignees"},
+			inputJSON: heredoc.Doc(`
+				{ "assignees": { "nodes": [
+					{
+						"id": "MDQ6VXNlcjE=",
+						"login": "monalisa",
+						"name": "Mona Lisa",
+						"databaseId": 1234
+					}
+				] } }
+			`),
+			outputJSON: heredoc.Doc(`
+				{
+					"assignees": [
+						{
+							"id": "MDQ6VXNlcjE=",
+							"login": "monalisa",
+							"name": "Mona Lisa",
+							"databaseId": 1234
+						}
+					]
+				}
+			`),
+		},
 		{
 			name:   "linked issues",
 			fields: []string{"closingIssuesReferences"},
diff --git a/api/query_builder.go b/api/query_builder.go
index 766c2b4aa1b..cb80b595f0c 100644
--- a/api/query_builder.go
+++ b/api/query_builder.go
@@ -388,7 +388,7 @@ func IssueGraphQL(fields []string) string {
 		case "headRepository":
 			q = append(q, `headRepository{id,name}`)
 		case "assignees":
-			q = append(q, `assignees(first:100){nodes{id,login,name},totalCount}`)
+			q = append(q, `assignees(first:100){nodes{id,login,name,databaseId},totalCount}`)
 		case "assignedActors":
 			q = append(q, assignedActors)
 		case "labels":
diff --git a/api/query_builder_test.go b/api/query_builder_test.go
index e39b0826958..f854cd36ac2 100644
--- a/api/query_builder_test.go
+++ b/api/query_builder_test.go
@@ -21,7 +21,7 @@ func TestPullRequestGraphQL(t *testing.T) {
 		{
 			name:   "fields with nested structures",
 			fields: []string{"author", "assignees"},
-			want:   "author{login,...on User{id,name}},assignees(first:100){nodes{id,login,name},totalCount}",
+			want:   "author{login,...on User{id,name}},assignees(first:100){nodes{id,login,name,databaseId},totalCount}",
 		},
 		{
 			name:   "compressed query",
@@ -67,7 +67,7 @@ func TestIssueGraphQL(t *testing.T) {
 		{
 			name:   "fields with nested structures",
 			fields: []string{"author", "assignees"},
-			want:   "author{login,...on User{id,name}},assignees(first:100){nodes{id,login,name},totalCount}",
+			want:   "author{login,...on User{id,name}},assignees(first:100){nodes{id,login,name,databaseId},totalCount}",
 		},
 		{
 			name:   "compressed query",