diff --git a/app/features/builds/BuildRepository.server.ts b/app/features/builds/BuildRepository.server.ts
index 0441ef29a..3c3f7e96e 100644
--- a/app/features/builds/BuildRepository.server.ts
+++ b/app/features/builds/BuildRepository.server.ts
@@ -257,9 +257,9 @@ export async function ownerIdById(buildId: number) {
 		.selectFrom("Build")
 		.select("ownerId")
 		.where("id", "=", buildId)
-		.executeTakeFirstOrThrow();
+		.executeTakeFirst();
 
-	return result.ownerId;
+	return result?.ownerId ?? null;
 }
 
 export async function abilityPointAverages(weaponSplId?: MainWeaponId | null) {