diff --git a/frontend-react/src/components/analyzer/BuildAnalyzerPage.tsx b/frontend-react/src/components/analyzer/BuildAnalyzerPage.tsx
index fa480be3a..28dcecc53 100644
--- a/frontend-react/src/components/analyzer/BuildAnalyzerPage.tsx
+++ b/frontend-react/src/components/analyzer/BuildAnalyzerPage.tsx
@@ -22,7 +22,10 @@ const BuildAnalyzerPage: React.FC<RouteComponentProps> = () => {
   const { themeColor, grayWithShade } = useContext(MyThemeContext)
   const location = useLocation()
   const [build, setBuild] = useState<Partial<Build>>(getBuildFromUrl())
-  const [otherBuild, setOtherBuild] = useState<Partial<Build>>(defaultBuild)
+  const [otherBuild, setOtherBuild] = useState<Partial<Build>>({
+    ...defaultBuild,
+    weapon: getBuildFromUrl().weapon,
+  })
   const [showOther, setShowOther] = useState(false)
   const [showNotActualProgress, setShowNotActualProgress] = useState(false)
   const [startChartsAtZero, setStartChartsAtZero] = useState(true)