diff --git a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
index 8c49272653..322b897735 100644
--- a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
+++ b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
@@ -54,6 +54,9 @@ namespace Content.Shared.Placeable
             if(!args.User.TryGetComponent<SharedHandsComponent>(out var handComponent))
                 return;
 
+            if (!args.ClickLocation.IsValid(args.User.EntityManager))
+                return;
+
             if(!handComponent.TryDropEntity(args.Used, surface.Owner.Transform.Coordinates))
                 return;