diff --git a/Content.Client/Vehicle/VehicleSystem.cs b/Content.Client/Vehicle/VehicleSystem.cs
index e21255a05c..30bee5c949 100644
--- a/Content.Client/Vehicle/VehicleSystem.cs
+++ b/Content.Client/Vehicle/VehicleSystem.cs
@@ -60,7 +60,9 @@ namespace Content.Client.Vehicle
 
         private void OnRiderHandleState(EntityUid uid, RiderComponent component, ref ComponentHandleState args)
         {
-            // Server should only be sending states for our entity.
+            if (uid != _playerManager.LocalPlayer?.ControlledEntity)
+                return;
+
             if (args.Current is not RiderComponentState state) return;
             component.Vehicle = state.Entity;