diff --git a/src/RpcServer/RelayActor.cs b/src/RpcServer/RelayActor.cs
index 65397672b..ef8231c20 100644
--- a/src/RpcServer/RelayActor.cs
+++ b/src/RpcServer/RelayActor.cs
@@ -21,17 +21,19 @@ protected override void OnReceive(object message)
             switch (message)
             {
                 case IInventory inventory:
-                    this.senders.Add(inventory.Hash, Sender);
-                    neoSystem.Blockchain.Tell(inventory);
-                    break;
+                    {
+                        senders.Add(inventory.Hash, Sender);
+                        neoSystem.Blockchain.Tell(inventory);
+                        break;
+                    }
                 case RelayResult reason:
-                    UInt256 hash = reason.Inventory.Hash;
-                    if (senders.ContainsKey(reason.Inventory.Hash))
                     {
-                        senders[hash].Tell(reason);
-                        senders.Remove(hash);
+                        if (senders.Remove(reason.Inventory.Hash, out var actor))
+                        {
+                            actor.Tell(reason);
+                        }
+                        break;
                     }
-                    break;
             }
         }