diff --git a/app/features/build-analyzer/analyzer-hooks.ts b/app/features/build-analyzer/analyzer-hooks.ts
index f1eabfddb..5016dcbcb 100644
--- a/app/features/build-analyzer/analyzer-hooks.ts
+++ b/app/features/build-analyzer/analyzer-hooks.ts
@@ -23,7 +23,7 @@ import {
 export function useAnalyzeBuild() {
 	const [searchParams, setSearchParams] = useSearchParams();
 
-	const mainWeaponId = validatedWeaponIdFromSearchParams(searchParams);
+	const mainWeaponId = validatedWeaponIdFromSearchParams(searchParams) ?? 0;
 	const build = validatedBuildFromSearchParams(searchParams);
 	const build2 = validatedBuildFromSearchParams(searchParams, "build2", build);
 	const ldeIntensity = validatedLdeIntensityFromSearchParams(searchParams);
diff --git a/app/features/build-analyzer/core/utils.ts b/app/features/build-analyzer/core/utils.ts
index 1bca273ce..ec0ab3594 100644
--- a/app/features/build-analyzer/core/utils.ts
+++ b/app/features/build-analyzer/core/utils.ts
@@ -229,12 +229,15 @@ export function validatedAnyWeaponFromSearchParams(
 		return { type: "MAIN", id: id as MainWeaponId };
 	}
 
-	return { type: "MAIN", id: validatedWeaponIdFromSearchParams(searchParams) };
+	return {
+		type: "MAIN",
+		id: validatedWeaponIdFromSearchParams(searchParams) ?? 0,
+	};
 }
 
 export function validatedWeaponIdFromSearchParams(
 	searchParams: URLSearchParams,
-): MainWeaponId {
+) {
 	const weaponId = searchParams.get("weapon")
 		? Number(searchParams.get("weapon"))
 		: null;
@@ -243,7 +246,7 @@ export function validatedWeaponIdFromSearchParams(
 		return weaponId as MainWeaponId;
 	}
 
-	return weaponCategories[0].weaponIds[0];
+	return null;
 }
 
 function validateAbility(
diff --git a/app/features/user-page/routes/u.$identifier.builds.new.tsx b/app/features/user-page/routes/u.$identifier.builds.new.tsx
index 75437b2ed..c10bbc093 100644
--- a/app/features/user-page/routes/u.$identifier.builds.new.tsx
+++ b/app/features/user-page/routes/u.$identifier.builds.new.tsx
@@ -217,6 +217,7 @@ function WeaponsSelector() {
 					return (
 						<div key={i} className="stack horizontal sm items-center">
 							<WeaponSelect
+								isRequired
 								onChange={(weaponId) =>
 									setWeapons((weapons) => {
 										const newWeapons = [...weapons];