diff --git a/src/rpc/server.ts b/src/rpc/server.ts
index 5d51e2f..bb0b56e 100644
--- a/src/rpc/server.ts
+++ b/src/rpc/server.ts
@@ -126,6 +126,10 @@ export class RPCServer {
 
     if (isStream) {
       result = await streamHandler(isStream);
+    } else {
+      if (result && !result.error && !("data" in result)) {
+        result = { data: result };
+      }
     }
 
     result = result as RPCResponse;