diff --git a/cmd/server/docs/docs.go b/cmd/server/docs/docs.go
index b7fe1dd6c..252d98ae9 100644
--- a/cmd/server/docs/docs.go
+++ b/cmd/server/docs/docs.go
@@ -4047,7 +4047,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "index": {
-                    "type": "integer"
+                    "type": "string"
                 },
                 "title": {
                     "type": "string"
diff --git a/server/forge/bitbucket/bitbucket.go b/server/forge/bitbucket/bitbucket.go
index e4c632e51..e88d89a75 100644
--- a/server/forge/bitbucket/bitbucket.go
+++ b/server/forge/bitbucket/bitbucket.go
@@ -21,6 +21,7 @@ import (
 	"net/http"
 	"net/url"
 	"path/filepath"
+	"strconv"
 
 	"golang.org/x/oauth2"
 
@@ -369,7 +370,7 @@ func (c *config) PullRequests(ctx context.Context, u *model.User, r *model.Repo,
 	result := []*model.PullRequest{}
 	for _, pullRequest := range pullRequests {
 		result = append(result, &model.PullRequest{
-			Index: int64(pullRequest.ID),
+			Index: model.ForgeRemoteID(strconv.Itoa(int(pullRequest.ID))),
 			Title: pullRequest.Title,
 		})
 	}
diff --git a/server/forge/bitbucket/bitbucket_test.go b/server/forge/bitbucket/bitbucket_test.go
index 43b6b7c58..99b96838a 100644
--- a/server/forge/bitbucket/bitbucket_test.go
+++ b/server/forge/bitbucket/bitbucket_test.go
@@ -200,7 +200,7 @@ func Test_bitbucket(t *testing.T) {
 				repoPRs, err := c.PullRequests(ctx, fakeUser, fakeRepo, &listOpts)
 				g.Assert(err).IsNil()
 				g.Assert(repoPRs[0].Title).Equal("PRs title")
-				g.Assert(repoPRs[0].Index).Equal(int64(123))
+				g.Assert(repoPRs[0].Index).Equal(model.ForgeRemoteID("123"))
 			})
 			g.It("Should handle not found errors", func() {
 				_, err := c.PullRequests(ctx, fakeUser, fakeRepoNotFound, &listOpts)
diff --git a/server/forge/gitea/gitea.go b/server/forge/gitea/gitea.go
index c6e120bf2..2b780cd81 100644
--- a/server/forge/gitea/gitea.go
+++ b/server/forge/gitea/gitea.go
@@ -488,7 +488,7 @@ func (c *Gitea) PullRequests(ctx context.Context, u *model.User, r *model.Repo,
 	result := make([]*model.PullRequest, len(pullRequests))
 	for i := range pullRequests {
 		result[i] = &model.PullRequest{
-			Index: pullRequests[i].Index,
+			Index: model.ForgeRemoteID(strconv.Itoa(int(pullRequests[i].Index))),
 			Title: pullRequests[i].Title,
 		}
 	}
diff --git a/server/forge/github/github.go b/server/forge/github/github.go
index 9f4d635e4..1ffea5d00 100644
--- a/server/forge/github/github.go
+++ b/server/forge/github/github.go
@@ -296,7 +296,7 @@ func (c *client) PullRequests(ctx context.Context, u *model.User, r *model.Repo,
 	result := make([]*model.PullRequest, len(pullRequests))
 	for i := range pullRequests {
 		result[i] = &model.PullRequest{
-			Index: int64(pullRequests[i].GetNumber()),
+			Index: model.ForgeRemoteID(strconv.Itoa(pullRequests[i].GetNumber())),
 			Title: pullRequests[i].GetTitle(),
 		}
 	}
diff --git a/server/forge/gitlab/gitlab.go b/server/forge/gitlab/gitlab.go
index cc4f4b45e..3f4a57c65 100644
--- a/server/forge/gitlab/gitlab.go
+++ b/server/forge/gitlab/gitlab.go
@@ -326,7 +326,7 @@ func (g *GitLab) PullRequests(ctx context.Context, u *model.User, r *model.Repo,
 	result := make([]*model.PullRequest, len(pullRequests))
 	for i := range pullRequests {
 		result[i] = &model.PullRequest{
-			Index: int64(pullRequests[i].ID),
+			Index: model.ForgeRemoteID(strconv.Itoa(pullRequests[i].ID)),
 			Title: pullRequests[i].Title,
 		}
 	}
diff --git a/server/forge/mocks/forge.go b/server/forge/mocks/forge.go
index ad75c64a1..09cb0bf41 100644
--- a/server/forge/mocks/forge.go
+++ b/server/forge/mocks/forge.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.36.1. DO NOT EDIT.
+// Code generated by mockery v2.37.1. DO NOT EDIT.
 
 package mocks
 
diff --git a/server/model/pull_request.go b/server/model/pull_request.go
index 8e53cf48f..e5ed59717 100644
--- a/server/model/pull_request.go
+++ b/server/model/pull_request.go
@@ -15,6 +15,6 @@
 package model
 
 type PullRequest struct {
-	Index int64  `json:"index"`
-	Title string `json:"title"`
+	Index ForgeRemoteID `json:"index"`
+	Title string        `json:"title"`
 } //	@name PullRequest
diff --git a/server/store/mocks/store.go b/server/store/mocks/store.go
index 77a826676..66c63405a 100644
--- a/server/store/mocks/store.go
+++ b/server/store/mocks/store.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.36.1. DO NOT EDIT.
+// Code generated by mockery v2.37.1. DO NOT EDIT.
 
 package mocks
 
diff --git a/web/src/lib/api/types/pull_request.ts b/web/src/lib/api/types/pull_request.ts
index aa76e6433..59cdaccac 100644
--- a/web/src/lib/api/types/pull_request.ts
+++ b/web/src/lib/api/types/pull_request.ts
@@ -1,7 +1,7 @@
 // A version control pull request.
 export type PullRequest = {
   // The index of the pull request.
-  index: number;
+  index: string;
   // The title of the pull request.
   title: string;
 };