diff --git a/Content.Server/Doors/Components/AirlockComponent.cs b/Content.Server/Doors/Components/AirlockComponent.cs
index 9730cf9d34..a38aa0bb90 100644
--- a/Content.Server/Doors/Components/AirlockComponent.cs
+++ b/Content.Server/Doors/Components/AirlockComponent.cs
@@ -114,6 +114,7 @@ namespace Content.Server.Doors.Components
         public float AutoCloseDelayModifier = 1.0f;
 
         [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("safety")]
         public bool Safety = true;
 
         protected override void Initialize()
diff --git a/Resources/Changelog/Parts/windoor.yml b/Resources/Changelog/Parts/windoor.yml
new file mode 100644
index 0000000000..b4d9f56c83
--- /dev/null
+++ b/Resources/Changelog/Parts/windoor.yml
@@ -0,0 +1,4 @@
+author: mirrorcult
+changes:
+- type: Fix # One of the following: Add, Remove, Tweak, Fix
+  message: Fix certain windoors not autoclosing.
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml
index 846a825d54..bdec85619d 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml
@@ -60,6 +60,8 @@
   - type: AccessReader
   - type: Airlock
     openPanelVisible: true
+    # needed so that windoors will close regardless of whether there are people in it; it doesn't crush after all
+    safety: false
   - type: Door
     weldable: false
     crushDamage: