diff --git a/src/server/routes/rpc.ts b/src/server/routes/rpc.ts
index 55db437..e6b8ba2 100644
--- a/src/server/routes/rpc.ts
+++ b/src/server/routes/rpc.ts
@@ -7,15 +7,19 @@ export const rpcApp = new Hono();
 
 const handler = new RPCHandler(router);
 
-rpcApp.use("/*", async (c, next) => {
-  const { matched, response } = await handler.handle(c.req.raw, {
-    prefix: "/rpc",
-  });
+rpcApp.all("/*", async (c) => {
+  try {
+    const { matched, response } = await handler.handle(c.req.raw, {
+      prefix: "/rpc",
+    });
 
-  if (matched) {
-    return c.newResponse(response.body, response);
+    if (matched) {
+      return c.newResponse(response.body, response);
+    }
+
+    return c.json({ error: "Not found" }, 404);
+  } catch (error) {
+    console.error("RPC Handler error:", error);
+    return c.json({ error: "Internal server error" }, 500);
   }
-
-  await next();
-  return;
 });