diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs
index 5ad86fb20a..e2b8b5829d 100644
--- a/Content.Server/Doors/Systems/FirelockSystem.cs
+++ b/Content.Server/Doors/Systems/FirelockSystem.cs
@@ -28,8 +28,6 @@ namespace Content.Server.Doors.Systems
         {
             base.Initialize();
 
-
-            SubscribeLocalEvent<FirelockComponent, BeforeDoorAutoCloseEvent>(OnBeforeDoorAutoclose);
             SubscribeLocalEvent<FirelockComponent, AtmosAlarmEvent>(OnAtmosAlarm);
 
             SubscribeLocalEvent<FirelockComponent, PowerChangedEvent>(PowerChanged);
@@ -80,19 +78,6 @@ namespace Content.Server.Doors.Systems
             }
         }
 
-        private void OnBeforeDoorAutoclose(EntityUid uid, FirelockComponent component, BeforeDoorAutoCloseEvent args)
-        {
-            if (!this.IsPowered(uid, EntityManager))
-                args.Cancel();
-
-            // Make firelocks autoclose, but only if the last alarm type it
-            // remembers was a danger. This is to prevent people from
-            // flooding hallways with endless bad air/fire.
-            if (component.AlarmAutoClose &&
-                (_atmosAlarmable.TryGetHighestAlert(uid, out var alarm) && alarm != AtmosAlarmType.Danger || alarm == null))
-                args.Cancel();
-        }
-
         private void OnAtmosAlarm(EntityUid uid, FirelockComponent component, AtmosAlarmEvent args)
         {
             if (!this.IsPowered(uid, EntityManager))
diff --git a/Content.Shared/Doors/Components/FirelockComponent.cs b/Content.Shared/Doors/Components/FirelockComponent.cs
index ca62daaa0f..3f7d6c3f70 100644
--- a/Content.Shared/Doors/Components/FirelockComponent.cs
+++ b/Content.Shared/Doors/Components/FirelockComponent.cs
@@ -19,8 +19,6 @@ namespace Content.Shared.Doors.Components
         [DataField("lockedPryTimeModifier"), ViewVariables(VVAccess.ReadWrite)]
         public float LockedPryTimeModifier = 1.5f;
 
-        [DataField("autocloseDelay")] public TimeSpan AutocloseDelay = TimeSpan.FromSeconds(3f);
-
         /// <summary>
         /// Maximum pressure difference before the firelock will refuse to open, in kPa.
         /// </summary>
diff --git a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
index 7d033efdd4..47a29a4ba8 100644
--- a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
@@ -18,8 +18,6 @@ public abstract class SharedFirelockSystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<FirelockComponent, DoorStateChangedEvent>(OnUpdateState);
-
         // Access/Prying
         SubscribeLocalEvent<FirelockComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
         SubscribeLocalEvent<FirelockComponent, GetPryTimeModifierEvent>(OnDoorGetPryTimeModifier);
@@ -46,19 +44,6 @@ public abstract class SharedFirelockSystem : EntitySystem
         return _doorSystem.OnPartialClose(uid, door);
     }
 
-    private void OnUpdateState(EntityUid uid, FirelockComponent component, DoorStateChangedEvent args)
-    {
-        var ev = new BeforeDoorAutoCloseEvent();
-        RaiseLocalEvent(uid, ev);
-        UpdateVisuals(uid, component, args);
-        if (ev.Cancelled)
-        {
-            return;
-        }
-
-        _doorSystem.SetNextStateChange(uid, component.AutocloseDelay);
-    }
-
     #region Access/Prying
 
     private void OnBeforeDoorOpened(EntityUid uid, FirelockComponent component, BeforeDoorOpenedEvent args)