diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs
index ecb8da9c18..1cb0066d88 100644
--- a/Content.Server/Storage/Components/EntityStorageComponent.cs
+++ b/Content.Server/Storage/Components/EntityStorageComponent.cs
@@ -148,7 +148,7 @@ namespace Content.Server.Storage.Components
 
             if (Owner.TryGetComponent<PlaceableSurfaceComponent>(out var surface))
             {
-                EntitySystem.Get<PlaceableSurfaceSystem>().SetPlaceable(surface, Open);
+                EntitySystem.Get<PlaceableSurfaceSystem>().SetPlaceable(Owner.Uid, Open, surface);
             }
 
             UpdateAppearance();
@@ -264,7 +264,7 @@ namespace Content.Server.Storage.Components
 
             if (Owner.TryGetComponent<PlaceableSurfaceComponent>(out var surface))
             {
-                EntitySystem.Get<PlaceableSurfaceSystem>().SetPlaceable(surface, Open);
+                EntitySystem.Get<PlaceableSurfaceSystem>().SetPlaceable(Owner.Uid, Open, surface);
             }
 
             if (Owner.TryGetComponent(out AppearanceComponent? appearance))
diff --git a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
index 7a683c03b5..8c49272653 100644
--- a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
+++ b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
@@ -16,20 +16,29 @@ namespace Content.Shared.Placeable
             SubscribeLocalEvent<PlaceableSurfaceComponent, ComponentHandleState>(OnHandleState);
         }
 
-        public void SetPlaceable(PlaceableSurfaceComponent surface, bool isPlaceable)
+        public void SetPlaceable(EntityUid uid, bool isPlaceable, PlaceableSurfaceComponent? surface = null)
         {
+            if (!Resolve(uid, ref surface))
+                return;
+
             surface.IsPlaceable = isPlaceable;
             surface.Dirty();
         }
 
-        public void SetPlaceCentered(PlaceableSurfaceComponent surface, bool placeCentered)
+        public void SetPlaceCentered(EntityUid uid, bool placeCentered, PlaceableSurfaceComponent? surface = null)
         {
+            if (!Resolve(uid, ref surface))
+                return;
+
             surface.PlaceCentered = placeCentered;
             surface.Dirty();
         }
 
-        public void SetPositionOffset(PlaceableSurfaceComponent surface, Vector2 offset)
+        public void SetPositionOffset(EntityUid uid, Vector2 offset, PlaceableSurfaceComponent? surface = null)
         {
+            if (!Resolve(uid, ref surface))
+                return;
+
             surface.PositionOffset = offset;
             surface.Dirty();
         }