diff --git a/src/app/UI/Match/ClassicWeaponStats.js b/src/app/UI/Match/ClassicWeaponStats.js
index 867b62c..a82c2ef 100644
--- a/src/app/UI/Match/ClassicWeaponStats.js
+++ b/src/app/UI/Match/ClassicWeaponStats.js
@@ -44,11 +44,12 @@ function renderTable(selectedWeapon, data, players, totalTeams){
     return <InteractiveTable width={3} headers={headers} rows={rows}/>
 }
 
-export default function ClassicWeaponStats({weaponNames, weaponImages, data, players, totalTeams}){
+export default function ClassicWeaponStats({weaponNames, weaponImages, data, players, totalTeams, firstWeapon}){
 
-    if(data.length === 0) return null;
+    
+    const [selectedWeapon, setSelectedWeapon] = useState(firstWeapon);
 
-    const [selectedWeapon, setSelectedWeapon] = useState("0");
+    if(data.length === 0) return null;
   
     const tabOptions = [];
 
@@ -69,16 +70,6 @@ export default function ClassicWeaponStats({weaponNames, weaponImages, data, pla
         return 0;
 
     });
-
-    const firstTab = (tabOptions.length > 0) ? tabOptions[0].value : "";
-
-    
-    useEffect(() =>{
-  
-            setSelectedWeapon(firstTab);
-     
-    }, [firstTab]);
-
    
 
     return <>
@@ -86,6 +77,6 @@ export default function ClassicWeaponStats({weaponNames, weaponImages, data, pla
         <Tabs options={tabOptions} selectedValue={selectedWeapon} changeSelected={(value) =>{
             setSelectedWeapon(value);
         }}/>
-        {renderTable(selectedWeapon, data, players, totalTeams)}
+        {renderTable(selectedWeapon, data, players, totalTeams, setSelectedWeapon)}
     </>
 }
\ No newline at end of file
diff --git a/src/app/match/[id]/page.js b/src/app/match/[id]/page.js
index 15787e9..4b61e56 100644
--- a/src/app/match/[id]/page.js
+++ b/src/app/match/[id]/page.js
@@ -127,7 +127,14 @@ export default async function MatchPage({params, searchParams}) {
     elems[pageLayout["Damage Stats"]] = (pageSettings["Display Damage Stats"] === "1") ?  <DamageStats key="damage" data={matchData.playerData} totalTeams={totalTeams}/> : null;
 
 
-    elems[pageLayout["Classic Weapon Stats"]] = (pageSettings["Display Classic Weapon Stats"] === "1") ?  <ClassicWeaponStats key="classic-weapons" weaponNames={matchData.weaponStats.names} weaponImages={weaponImages} data={classicStats} players={matchData.basicPlayers} totalTeams={totalTeams}/> : null;
+    let testWeapon = "-1";
+
+    const testKeys = Object.keys(matchData.weaponStats.names);
+    
+    //all is 0 always first
+    if(testKeys.length > 1) testWeapon = testKeys[1];
+
+    elems[pageLayout["Classic Weapon Stats"]] = (pageSettings["Display Classic Weapon Stats"] === "1") ?  <ClassicWeaponStats key="classic-weapons" weaponNames={matchData.weaponStats.names} weaponImages={weaponImages} data={classicStats} players={matchData.basicPlayers} totalTeams={totalTeams} firstWeapon={testWeapon}/> : null;