diff --git a/app/components/Combobox.tsx b/app/components/Combobox.tsx
index a1b9dc01f..6b537b89e 100644
--- a/app/components/Combobox.tsx
+++ b/app/components/Combobox.tsx
@@ -208,7 +208,11 @@ export function WeaponCombobox({
     <Combobox
       inputName={inputName}
       options={mainWeaponIds.map(idToWeapon)}
-      initialValue={initialWeaponId ? idToWeapon(initialWeaponId) : undefined}
+      initialValue={
+        typeof initialWeaponId === "number"
+          ? idToWeapon(initialWeaponId)
+          : undefined
+      }
       placeholder={t(`${mainWeaponIds[0]}`)}
       onChange={onChange}
       className={className}
diff --git a/app/modules/analyzer/useAnalyzeBuild.ts b/app/modules/analyzer/useAnalyzeBuild.ts
index df829a29d..e9725421f 100644
--- a/app/modules/analyzer/useAnalyzeBuild.ts
+++ b/app/modules/analyzer/useAnalyzeBuild.ts
@@ -1,7 +1,8 @@
 import * as React from "react";
-import type {
-  BuildAbilitiesTupleWithUnknown,
-  MainWeaponId,
+import {
+  type BuildAbilitiesTupleWithUnknown,
+  type MainWeaponId,
+  mainWeaponIds,
 } from "../in-game-lists";
 import { buildStats } from "./stats";
 
@@ -11,7 +12,9 @@ export function useAnalyzeBuild() {
     ["UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN"],
     ["UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN"],
   ]);
-  const [weaponId, setWeaponId] = React.useState<MainWeaponId>(0);
+  const [weaponId, setWeaponId] = React.useState<MainWeaponId>(
+    mainWeaponIds[0]
+  );
 
   const analyzed = React.useMemo(
     () => buildStats({ build, weaponSplId: weaponId }),
diff --git a/app/routes/analyzer.tsx b/app/routes/analyzer.tsx
index 50eee9f70..8f429c9aa 100644
--- a/app/routes/analyzer.tsx
+++ b/app/routes/analyzer.tsx
@@ -30,7 +30,7 @@ export default function BuildAnalyzerPage() {
         <div className="stack lg items-center">
           <div>
             <WeaponCombobox
-              inputName="weapon-1"
+              inputName="weapon"
               initialWeaponId={weaponId}
               onChange={(opt) =>
                 opt && setWeaponId(Number(opt.value) as MainWeaponId)