diff --git a/src/libnpsharp/RPC/RPCClientStream.cs b/src/libnpsharp/RPC/RPCClientStream.cs
index 82396c1..e594fcf 100644
--- a/src/libnpsharp/RPC/RPCClientStream.cs
+++ b/src/libnpsharp/RPC/RPCClientStream.cs
@@ -136,7 +136,7 @@ namespace NPSharp.RPC
                 return message;
 
             _callbacks[message.MessageId].Invoke(message);
-            _callbacks.Remove(message.MessageId);
+            // TODO: Callback cleanup
 
             return message;
         }