diff --git a/Content.Server/Pinpointer/ProximityBeeperSystem.cs b/Content.Server/Pinpointer/ProximityBeeperSystem.cs
index 472a50fb23..f0d90459d8 100644
--- a/Content.Server/Pinpointer/ProximityBeeperSystem.cs
+++ b/Content.Server/Pinpointer/ProximityBeeperSystem.cs
@@ -22,7 +22,7 @@ public sealed class ProximityBeeperSystem : EntitySystem
     public override void Initialize()
     {
         SubscribeLocalEvent<ProximityBeeperComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<ProximityBeeperComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<ProximityBeeperComponent, MapInitEvent>(OnInit);
         SubscribeLocalEvent<ProximityBeeperComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<ProximityBeeperComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
     }
@@ -34,7 +34,7 @@ public sealed class ProximityBeeperSystem : EntitySystem
         args.Handled = TryToggle(uid, component, args.User);
     }
 
-    private void OnInit(EntityUid uid, ProximityBeeperComponent component, ComponentInit args)
+    private void OnInit(EntityUid uid, ProximityBeeperComponent component, MapInitEvent args)
     {
         if (component.NextBeepTime < _timing.CurTime)
             component.NextBeepTime = _timing.CurTime;