diff --git a/Client/Tuning/main.js b/Client/Tuning/main.js
index 23c80d3b..8b5428ed 100644
--- a/Client/Tuning/main.js
+++ b/Client/Tuning/main.js
@@ -149,14 +149,14 @@ mp.events.add("showTuningMenu", () => {
 
     mainMenu.ItemSelect.on((item) => {
         var modSlot = getSlotId(item.Text);
-        var currentMod = localVehicle.getMod(modSlot);
-        var currentModItem;
-
         if (item.Text.startsWith("Slot")) {
             restStr = item.Text.substring(5);
             modSlot = parseInt(restStr);
         }
 
+        var currentMod = localVehicle.getMod(modSlot);
+        var currentModItem;
+
         var modNum = localVehicle.getNumMods(modSlot);
 
         var modMenu = new Menu(item.Text, "Änderung: " + item.Text, new Point(50, 50));
@@ -201,9 +201,6 @@ mp.events.add("showTuningMenu", () => {
 
         modMenu.MenuClose.on(() => {
             localVehicle.setMod(modSlot, currentMod);
-        });
-
-        modMenu.MenuClose.on(() => {
             mainMenu.Visible = true;
             modMenu.Visible = false;
         });
diff --git a/Server/Managers/TuningManager.cs b/Server/Managers/TuningManager.cs
index e3bbd02e..3f45c37e 100644
--- a/Server/Managers/TuningManager.cs
+++ b/Server/Managers/TuningManager.cs
@@ -90,6 +90,15 @@ namespace reallife_gamemode.Server.Managers
                 }
                 else
                 {
+                    if (vMod == null)
+                    {
+                        vMod = new VehicleMod
+                        {
+                            ServerVehicleId = sV.Id,
+                            Slot = slot
+                        };
+                        dbContext.VehicleMods.Add(vMod);
+                    }
                     vMod.ModId = index;
                 }
                 dbContext.SaveChanges();
diff --git a/Server/Managers/VehicleManager.cs b/Server/Managers/VehicleManager.cs
index 0fce5231..d2345fbb 100644
--- a/Server/Managers/VehicleManager.cs
+++ b/Server/Managers/VehicleManager.cs
@@ -43,7 +43,6 @@ namespace reallife_gamemode.Server.Managers
 
         public static Vehicle GetVehicleFromServerVehicle(ServerVehicle serverVehicle)
         {
-            Console.WriteLine("calling GetVehicleFromServerVehicle | " + serverVehicle.Id);
             if(!_serverVehicles.ContainsKey(serverVehicle.Id))
             {
                 return null;