diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs
index f172060ded..974755f000 100644
--- a/Content.Shared/RCD/Systems/RCDSystem.cs
+++ b/Content.Shared/RCD/Systems/RCDSystem.cs
@@ -230,13 +230,19 @@ public class RCDSystem : EntitySystem
 
         // Exit if the RCD prototype has changed
         if (component.ProtoId != args.Event.StartingProtoId)
+        {
+            args.Cancel();
             return;
+        }
 
         // Ensure the RCD operation is still valid
         var location = GetCoordinates(args.Event.Location);
 
         if (!TryGetMapGridData(location, out var mapGridData))
+        {
+            args.Cancel();
             return;
+        }
 
         if (!IsRCDOperationStillValid(uid, component, mapGridData.Value, args.Event.Target, args.Event.User))
             args.Cancel();