diff --git a/pr_agent/servers/serverless.py b/pr_agent/servers/serverless.py
index 91596315..b03d9171 100644
--- a/pr_agent/servers/serverless.py
+++ b/pr_agent/servers/serverless.py
@@ -1,12 +1,15 @@
 from fastapi import FastAPI
 from mangum import Mangum
+from starlette.middleware import Middleware
+from starlette_context.middleware import RawContextMiddleware
 
 from pr_agent.log import setup_logger
 from pr_agent.servers.github_app import router
 
 setup_logger()
 
-app = FastAPI()
+middleware = [Middleware(RawContextMiddleware)]
+app = FastAPI(middleware=middleware)
 app.include_router(router)
 
 handler = Mangum(app, lifespan="off")