diff --git a/charts/sourcegraph/CHANGELOG.md b/charts/sourcegraph/CHANGELOG.md
index 2614bc39..581aeb7f 100644
--- a/charts/sourcegraph/CHANGELOG.md
+++ b/charts/sourcegraph/CHANGELOG.md
@@ -9,6 +9,7 @@ Use `**BREAKING**:` to denote a breaking change
 ## Unreleased
 
 - Fix Pod Disruption Budget for sourcegraph-frontend
+- Added a startup probe to the gitserver statefulset to give it time to run the on-disk migration from repo names to repo IDs
 
 ## 5.10.0
 
diff --git a/charts/sourcegraph/templates/gitserver/gitserver.StatefulSet.yaml b/charts/sourcegraph/templates/gitserver/gitserver.StatefulSet.yaml
index 08d6b672..cb856118 100644
--- a/charts/sourcegraph/templates/gitserver/gitserver.StatefulSet.yaml
+++ b/charts/sourcegraph/templates/gitserver/gitserver.StatefulSet.yaml
@@ -56,6 +56,14 @@ spec:
         {{- end }}
         {{- include "sourcegraph.openTelemetryEnv" . | nindent 8 }}
         terminationMessagePolicy: FallbackToLogsOnError
+        # Temporary: when migrating from repo names to repo IDs on disk,
+        # gitserver can take a little while to start up. To avoid killing the
+        # pod because of a failed liveness probe, we give it 2 minutes to start up.
+        startupProbe:
+          tcpSocket:
+            port: rpc
+          failureThreshold: 120
+          periodSeconds: 1
         livenessProbe:
           initialDelaySeconds: 5
           tcpSocket: