diff --git a/internal/jsonrpc2/wire.go b/internal/jsonrpc2/wire.go
index 58ee41f0..309b8002 100644
--- a/internal/jsonrpc2/wire.go
+++ b/internal/jsonrpc2/wire.go
@@ -34,7 +34,7 @@ var (
 	// ErrUnknown should be used for all non coded errors.
 	ErrUnknown = NewError(-32001, "JSON RPC unknown error")
 	// ErrServerClosing is returned for calls that arrive while the server is closing.
-	ErrServerClosing = NewError(-32002, "JSON RPC server is closing")
+	ErrServerClosing = NewError(-32004, "JSON RPC server is closing")
 	// ErrClientClosing is a dummy error returned for calls initiated while the client is closing.
 	ErrClientClosing = NewError(-32003, "JSON RPC client is closing")
 )
diff --git a/mcp/shared.go b/mcp/shared.go
index 07ea5dff..031f8cc5 100644
--- a/mcp/shared.go
+++ b/mcp/shared.go
@@ -207,13 +207,7 @@ func sessionMethod[S Session, P Params, R Result](f func(S, context.Context, P)
 
 // Error codes
 const (
-	// The error code to return when a resource isn't found.
-	// See https://modelcontextprotocol.io/specification/2025-03-26/server/resources#error-handling
-	// However, the code they chose is in the wrong space
-	// (see https://github.com/modelcontextprotocol/modelcontextprotocol/issues/509).
-	// so we pick a different one, arbitrarily for now (until they fix it).
-	// The immediate problem is that jsonprc2 defines -32002 as "server closing".
-	CodeResourceNotFound = -31002
+	CodeResourceNotFound = -32002
 	// The error code if the method exists and was called properly, but the peer does not support it.
 	CodeUnsupportedMethod = -31001
 )