diff --git a/Content.Client/Buckle/BuckleComponent.cs b/Content.Client/Buckle/BuckleComponent.cs
index f791a6f082..be9370f43c 100644
--- a/Content.Client/Buckle/BuckleComponent.cs
+++ b/Content.Client/Buckle/BuckleComponent.cs
@@ -41,7 +41,7 @@ namespace Content.Client.Buckle
                 return;
             }
 
-            if (!_entMan.TryGetComponent(Owner, out RiderComponent? rider))
+            if (LastEntityBuckledTo != null && _entMan.HasComponent<VehicleComponent>(LastEntityBuckledTo))
             {
                 return;
             }