diff --git a/Content.Server/Pinpointer/ProximityBeeperSystem.cs b/Content.Server/Pinpointer/ProximityBeeperSystem.cs
index b473d973724e76..d52223e2b4ec82 100644
--- a/Content.Server/Pinpointer/ProximityBeeperSystem.cs
+++ b/Content.Server/Pinpointer/ProximityBeeperSystem.cs
@@ -80,7 +80,10 @@ public void UpdateBeep(EntityUid uid, ProximityBeeperComponent? component = null
 
         var scalingFactor = distance / component.MaximumDistance;
         var interval = (component.MaxBeepInterval - component.MinBeepInterval) * scalingFactor + component.MinBeepInterval;
+
         component.NextBeepTime += interval;
+        if (component.NextBeepTime < _timing.CurTime) // Prevents spending time out of range accumulating a deficit which causes a series of very rapid beeps when comeing into range.
+            component.NextBeepTime = _timing.CurTime + interval;
     }
 
     /// <summary>