diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/RegExFindComponent.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/RegExFindComponent.cs
index eef6630b0..262a45d85 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/RegExFindComponent.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/RegExFindComponent.cs
@@ -54,9 +54,9 @@ namespace Barotrauma.Items.Components
 
         public override void Update(float deltaTime, Camera cam)
         {
-            if (string.IsNullOrWhiteSpace(expression) || regex==null) return;
+            if (string.IsNullOrWhiteSpace(expression) || regex == null) return;
 
-            if (receivedSignal != previousReceivedSignal)
+            if (receivedSignal != previousReceivedSignal && receivedSignal != null)
             {
                 try
                 {