diff --git a/packages/frontend/src/game/weapons/functions/renderWeapon.tsx b/packages/frontend/src/game/weapons/functions/renderWeapon.tsx
index c7e5327..a3fc2ba 100644
--- a/packages/frontend/src/game/weapons/functions/renderWeapon.tsx
+++ b/packages/frontend/src/game/weapons/functions/renderWeapon.tsx
@@ -13,6 +13,7 @@ import { Nova } from "../weapons/primary/Nova/Nova";
 import { RPG } from "../weapons/secondary/RPG/RPG";
 import { Saiga } from "../weapons/primary/Saiga/Saiga";
 import { Scorpion } from "../weapons/primary/Scorpion/Scorpion";
+import { assertNever } from "@fps/lib";
 
 interface RenderWeaponProps {
     playerStateRef: React.MutableRefObject<GamePlayerState>;
@@ -53,7 +54,10 @@ export const RenderWeapon: React.FC<RenderWeaponProps> = ({ playerStateRef }) =>
         // Melee Weapons
         case "Knife":
             return <Knife playerStateRef={playerStateRef} />;
-
-        // TODO: Bring back assertNever https://app.clickup.com/t/86b5v1m7h
+        // No Weapon
+        case null:
+            return null;
+        default:
+            return assertNever(player.currentWeapon);
     }
 };
diff --git a/packages/lib/src/engine/slices/game/gameSlice.types.ts b/packages/lib/src/engine/slices/game/gameSlice.types.ts
index adcd7c6..9b03736 100644
--- a/packages/lib/src/engine/slices/game/gameSlice.types.ts
+++ b/packages/lib/src/engine/slices/game/gameSlice.types.ts
@@ -7,7 +7,7 @@ export interface GameTeamState {
 }
 
 export interface GameGameState {
-    currentTimeMs: number; // TODO: Add this later when games can actually start and end https://app.clickup.com/t/86b5v1m7h
+    currentTimeMs: number; // TODO: Add this later when games can actually start and end https://app.clickup.com/t/86b5v1mym
 }
 
 export interface GameSliceState {