diff --git a/Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs b/Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs
index 8d29c0d697..a847c47012 100644
--- a/Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs
+++ b/Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs
@@ -96,6 +96,10 @@ namespace Content.Server.GameObjects.Components.Items.RCD
 
         async Task<bool> IAfterInteract.AfterInteract(AfterInteractEventArgs   eventArgs)
         {
+            // FIXME: Make this work properly. Right now it relies on the click location being on a grid, which is bad.
+            if (!eventArgs.ClickLocation.IsValid(Owner.EntityManager) || !eventArgs.ClickLocation.GetGridId(Owner.EntityManager).IsValid())
+                return false;
+
             //No changing mode mid-RCD
             var startingMode = _mode;