diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs
index 9c04f95f..2a953e97 100644
--- a/ReallifeGamemode.Server/Managers/InteractionManager.cs
+++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs
@@ -859,18 +859,22 @@ namespace ReallifeGamemode.Server.Managers
         return;
       }
 
+      if (serverVehicle is UserVehicle userVehicle)
+      {
+        Player owner = PlayerService.GetPlayerByNameOrId(dbContext.Users.Where(u => u.Id == userVehicle.UserId).Select(u => u.Name).First());
+        if (owner == null || !owner.IsLoggedIn() || player.Position.DistanceTo(owner.Position) > 15)
+        {
+          player.SendNotification("~r~Der Besitzer des Fahrzeugs ist nicht in der Nähe");
+          return;
+        }
+      }
+
       if (serverVehicle.Model == VehicleHash.Riot)
       {
         player.SendNotification("~r~Der Riot muss zur Asservatenkammer gefahren werden");
         return;
       }
 
-      if (VehicleStreaming.GetLockState(vehicle) || serverVehicle.Locked)
-      {
-        player.SendNotification("~r~Dieses Fahrzeug ist abgeschlossen");
-        return;
-      }
-
       var targetItems = InventoryManager.GetVehicleItems(vehicle);
       List<string> illItemsList = new List<string>();
       bool illegalItemsFound = false;