diff --git a/api/queries_repo.go b/api/queries_repo.go
index 99041e49f..a5b926fc0 100644
--- a/api/queries_repo.go
+++ b/api/queries_repo.go
@@ -1235,17 +1235,25 @@ func RepoAssignableUsers(client *Client, repo ghrepo.Interface) ([]RepoAssignee,
 // RepoAssignableActors fetches all the assignable actors for a repository on
 // GitHub hosts that support Actor assignees.
 func RepoAssignableActors(client *Client, repo ghrepo.Interface) ([]RepoAssignee, error) {
-	type repoActorAssignee struct {
-		ID    string
-		Login string
+	type repoBotAssignee struct {
+		ID       string
+		Login    string
+		TypeName string `graphql:"__typename"`
+	}
+
+	type repoUserAssignee struct {
+		ID       string
+		Login    string
+		Name     string
+		TypeName string `graphql:"__typename"`
 	}
 
 	type responseData struct {
 		Repository struct {
 			SuggestedActors struct {
 				Nodes []struct {
-					User RepoAssignee      `graphql:"... on User"`
-					Bot  repoActorAssignee `graphql:"... on Bot"`
+					User repoUserAssignee `graphql:"... on User"`
+					Bot  repoBotAssignee  `graphql:"... on Bot"`
 				}
 				PageInfo struct {
 					HasNextPage bool
@@ -1270,13 +1278,20 @@ func RepoAssignableActors(client *Client, repo ghrepo.Interface) ([]RepoAssignee
 		}
 
 		for _, node := range query.Repository.SuggestedActors.Nodes {
-			// Edge case if the Actor is not a Bot or a User,
-			// it won't be unmarshalled properly, and we'll have an
-			// zero value node.
-			if node.User.ID == "" || node.User.Login == "" {
-				continue
+			if node.User.TypeName == "User" {
+				actor := RepoAssignee{
+					ID:    node.User.ID,
+					Login: node.User.Login,
+					Name:  node.User.Name,
+				}
+				actors = append(actors, actor)
+			} else if node.Bot.TypeName == "Bot" {
+				actor := RepoAssignee{
+					ID:    node.Bot.ID,
+					Login: node.Bot.Login,
+				}
+				actors = append(actors, actor)
 			}
-			actors = append(actors, node.User)
 		}
 
 		if !query.Repository.SuggestedActors.PageInfo.HasNextPage {
diff --git a/pkg/cmd/issue/edit/edit_test.go b/pkg/cmd/issue/edit/edit_test.go
index 5a06614bc..bf2a1c417 100644
--- a/pkg/cmd/issue/edit/edit_test.go
+++ b/pkg/cmd/issue/edit/edit_test.go
@@ -528,8 +528,8 @@ func Test_editRun(t *testing.T) {
 					httpmock.StringResponse(`
 					{ "data": { "repository": { "suggestedActors": {
 						"nodes": [
-							{ "login": "hubot", "id": "HUBOTID" },
-							{ "login": "MonaLisa", "id": "MONAID" }
+							{ "login": "hubot", "id": "HUBOTID", "__typename": "Bot" },
+							{ "login": "MonaLisa", "id": "MONAID", "__typename": "User" }
 						],
 						"pageInfo": { "hasNextPage": false, "endCursor": "Mg" }
 					} } } }
@@ -706,8 +706,8 @@ func mockRepoMetadata(_ *testing.T, reg *httpmock.Registry) {
 		httpmock.StringResponse(`
 		{ "data": { "repository": { "suggestedActors": {
 			"nodes": [
-				{ "login": "hubot", "id": "HUBOTID" },
-				{ "login": "MonaLisa", "id": "MONAID" }
+				{ "login": "hubot", "id": "HUBOTID", "__typename": "Bot" },
+				{ "login": "MonaLisa", "id": "MONAID", "__typename": "User" }
 			],
 			"pageInfo": { "hasNextPage": false }
 		} } } }