diff --git a/Client/Tuning/main.js b/Client/Tuning/main.js
index 8b4541f0..23c80d3b 100644
--- a/Client/Tuning/main.js
+++ b/Client/Tuning/main.js
@@ -182,10 +182,15 @@ mp.events.add("showTuningMenu", () => {
         }
 
         modMenu.ItemSelect.on((selectedItem, index) => {
-            currentModItem.SetRightBadge(BadgeStyle.None);
-            selectedItem.SetRightBadge(BadgeStyle.Car);
-            currentModItem = selectedItem;
+            if (currentModItem !== undefined) {
+                currentModItem.SetRightBadge(BadgeStyle.None);
+            }
+            if (selectedItem !== undefined) {
+                selectedItem.SetRightBadge(BadgeStyle.Car);
+                currentModItem = selectedItem;
+            }
             mp.events.callRemote("setVehicleMod", modSlot, index);
+            if (index === 0) index = -1;
             currentMod = index - 1;
         });