diff --git a/.eslintrc b/.eslintrc
index f03e5269f..6a62f9a78 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -23,7 +23,7 @@
         "@typescript-eslint/no-explicit-any": "warn",
         "@typescript-eslint/no-loss-of-precision": "warn",
         "@typescript-eslint/no-unnecessary-condition": "warn",
-        "no-case-declarations": "warn",
+        "no-case-declarations": "error",
         "prettier/prettier": "error",
         "@typescript-eslint/semi": "error",
         "no-mixed-spaces-and-tabs": "error",
diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts
index 597a4bb76..ffb6570d6 100644
--- a/src/services/inventoryService.ts
+++ b/src/services/inventoryService.ts
@@ -404,18 +404,21 @@ export const addItem = async (
             switch (typeName.substr(1).split("/")[2]) {
                 case "Mods": // Legendary Core
                 case "CosmeticEnhancers": // Traumatic Peculiar
-                    const changes = [
-                        {
-                            ItemType: typeName,
-                            ItemCount: quantity
-                        }
-                    ];
-                    addMods(inventory, changes);
-                    return {
-                        InventoryChanges: {
-                            RawUpgrades: changes
-                        }
-                    };
+                    {
+                        const changes = [
+                            {
+                                ItemType: typeName,
+                                ItemCount: quantity
+                            }
+                        ];
+                        addMods(inventory, changes);
+                        return {
+                            InventoryChanges: {
+                                RawUpgrades: changes
+                            }
+                        };
+                    }
+                    break;
             }
             break;
         }
diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts
index 2fd250300..72ad8aa4e 100644
--- a/src/services/missionInventoryUpdateService.ts
+++ b/src/services/missionInventoryUpdateService.ts
@@ -208,14 +208,14 @@ export const addMissionInventoryUpdates = (
                 inventory.CompletedSorties.push(value);
                 break;
             }
-            case "SeasonChallengeCompletions":
+            case "SeasonChallengeCompletions": {
                 const processedCompletions = value.map(({ challenge, id }) => ({
                     challenge: challenge.substring(challenge.lastIndexOf("/") + 1),
                     id
                 }));
-
                 inventory.SeasonChallengeHistory.push(...processedCompletions);
                 break;
+            }
             default:
                 // Equipment XP updates
                 if (equipmentKeys.includes(key as TEquipmentKey)) {
diff --git a/src/services/statsService.ts b/src/services/statsService.ts
index d520e842c..c7a983999 100644
--- a/src/services/statsService.ts
+++ b/src/services/statsService.ts
@@ -105,7 +105,7 @@ export const updateStats = async (playerStats: TStatsDatabaseDocument, payload:
                         case "FIRE_WEAPON":
                         case "HIT_ENTITY_ITEM":
                         case "HEADSHOT_ITEM":
-                        case "KILL_ENEMY_ITEM":
+                        case "KILL_ENEMY_ITEM": {
                             playerStats.Weapons ??= [];
                             const statKey = {
                                 FIRE_WEAPON: "fired",
@@ -126,10 +126,11 @@ export const updateStats = async (playerStats: TStatsDatabaseDocument, payload:
                                 }
                             }
                             break;
+                        }
 
                         case "KILL_ENEMY":
                         case "EXECUTE_ENEMY":
-                        case "HEADSHOT":
+                        case "HEADSHOT": {
                             playerStats.Enemies ??= [];
                             const enemyStatKey = {
                                 KILL_ENEMY: "kills",
@@ -149,6 +150,7 @@ export const updateStats = async (playerStats: TStatsDatabaseDocument, payload:
                                 }
                             }
                             break;
+                        }
 
                         case "DIE":
                             playerStats.Enemies ??= [];