diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
index ec8148f7d9d..340790870fd 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
@@ -400,3 +400,11 @@
   components:
   - type: AccessReader
     access: [["Psychologist"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsMail
+  suffix: Mail, Locked
+  components:
+  - type: AccessReader
+    access: [["Mail"]]
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Doors/Airlocks/access.yml
index 19226d067f9..d9e46454461 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Doors/Airlocks/access.yml
@@ -3,13 +3,15 @@
   id: AirlockMailLocked
   suffix: Mail, Locked
   components:
-  - type: AccessReader
-    access: [["Mail"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMail ]
 
 - type: entity
   parent: AirlockCargoGlass
   id: AirlockMailGlassLocked
   suffix: Mail, Locked
   components:
-  - type: AccessReader
-    access: [["Mail"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMail ]