diff --git a/storage_controller/src/http.rs b/storage_controller/src/http.rs
index 8ec8bccf2c..4035a15316 100644
--- a/storage_controller/src/http.rs
+++ b/storage_controller/src/http.rs
@@ -1416,6 +1416,12 @@ async fn handle_upsert_safekeeper(mut req: Request
) -> Result {
return res;
diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py
index 34a841f59f..7931a0a7d0 100644
--- a/test_runner/fixtures/neon_fixtures.py
+++ b/test_runner/fixtures/neon_fixtures.py
@@ -1344,6 +1344,8 @@ class NeonEnv:
and self.storage_controller_config.get("timelines_onto_safekeepers") is True
):
for sk_id, sk in enumerate(self.safekeepers):
+ # 0 is an invalid safekeeper id
+ sk_id = sk_id + 1
body = {
"id": sk_id,
"created_at": "2023-10-25T09:11:25Z",