diff --git a/src/mcp/client/sse.py b/src/mcp/client/sse.py
index 8a90e588b..abafacb96 100644
--- a/src/mcp/client/sse.py
+++ b/src/mcp/client/sse.py
@@ -84,7 +84,7 @@ async def sse_reader(
 
                                     case "message":
                                         try:
-                                            message = types.JSONRPCMessage.model_validate_json( # noqa: E501
+                                            message = types.JSONRPCMessage.model_validate_json(  # noqa: E501
                                                 sse.data
                                             )
                                             logger.debug(
diff --git a/src/mcp/server/__init__.py b/src/mcp/server/__init__.py
index 3ce8b7bf1..aa7adad79 100644
--- a/src/mcp/server/__init__.py
+++ b/src/mcp/server/__init__.py
@@ -16,8 +16,8 @@
 
 logger = logging.getLogger(__name__)
 
-request_ctx: contextvars.ContextVar[RequestContext] = contextvars.ContextVar(
-    "request_ctx"
+request_ctx: contextvars.ContextVar[RequestContext[ServerSession]] = (
+    contextvars.ContextVar("request_ctx")
 )
 
 
@@ -115,7 +115,7 @@ def get_capabilities(
         )
 
     @property
-    def request_context(self) -> RequestContext:
+    def request_context(self) -> RequestContext[ServerSession]:
         """If called outside of a request context, this will raise a LookupError."""
         return request_ctx.get()