diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml b/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml
index 2b6b9ccb4a..abb550c5e3 100644
--- a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml
@@ -18,15 +18,9 @@
         !type:PhysShapeAabb
           bounds: "-0.4,-0.4,0.4,0.4"
       layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+        - VaultImpassable
       mask:
       - Impassable
-      - MobImpassable
-      - VaultImpassable
   - type: Pullable
   - type: Anchorable
   - type: Damageable
diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml
index 1ad9f0516a..47bb1c160e 100644
--- a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml
@@ -22,6 +22,8 @@
         !type:PhysShapeAabb {}
       layer:
       - VaultImpassable
+      mask:
+      - Impassable
   - type: SnapGrid
     offset: Center
   - type: Climbable