diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/OscillatorComponent.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/OscillatorComponent.cs
index 80602bad8..f9d28c261 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/OscillatorComponent.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/OscillatorComponent.cs
@@ -31,7 +31,12 @@ namespace Barotrauma.Items.Components
         public float Frequency
         {
             get { return frequency; }
-            set { frequency = Math.Max(0.0f, value); }
+            set
+            {
+                //capped to 240 Hz (= 4 signals per frame) to prevent players 
+                //from wrecking the performance by setting the value too high
+                frequency = MathHelper.Clamp(value, 0.0f, 240.0f);
+            }
         }
 
         public OscillatorComponent(Item item, XElement element) :