diff --git a/packages/website/src/core/blitzkit/filterTank.ts b/packages/website/src/core/blitzkit/filterTank.ts
index a8c66c67d..3a23a36aa 100644
--- a/packages/website/src/core/blitzkit/filterTank.ts
+++ b/packages/website/src/core/blitzkit/filterTank.ts
@@ -1,6 +1,9 @@
 import type { TankDefinition } from '@blitzkit/core';
+import { times } from 'lodash-es';
 import type { TankFilters } from '../../stores/tankFilters';
 
+const SHELLS = times(3, (index) => index);
+
 export function filterTank(filters: TankFilters, tank: TankDefinition) {
   return (
     (filters.tiers.length === 0 || filters.tiers.includes(tank.tier)) &&
@@ -23,26 +26,16 @@ export function filterTank(filters: TankFilters, tank: TankDefinition) {
         tank.turrets.some((turret) =>
           turret.guns.some((gun) => gun.gun_type!.$case === 'auto_reloader'),
         ))) &&
-    (filters.shells[0] === null ||
-      tank.turrets.some((turret) =>
-        turret.guns.some(
-          (gun) =>
-            gun.gun_type!.value.base.shells[0]?.type === filters.shells[0],
+    tank.turrets.some((turret) =>
+      turret.guns.some((gun) =>
+        SHELLS.every(
+          (index) =>
+            filters.shells[index] === null ||
+            gun.gun_type!.value.base.shells[index] === undefined ||
+            gun.gun_type!.value.base.shells[index].type ===
+              filters.shells[index],
         ),
-      )) &&
-    (filters.shells[1] === null ||
-      tank.turrets.some((turret) =>
-        turret.guns.some(
-          (gun) =>
-            gun.gun_type!.value.base.shells[1]?.type === filters.shells[1],
-        ),
-      )) &&
-    (filters.shells[2] === null ||
-      tank.turrets.some((turret) =>
-        turret.guns.some(
-          (gun) =>
-            gun.gun_type!.value.base.shells[2]?.type === filters.shells[2],
-        ),
-      ))
+      ),
+    )
   );
 }