diff --git a/src/litserve/server.py b/src/litserve/server.py
index ccefb5c2..7a41842e 100644
--- a/src/litserve/server.py
+++ b/src/litserve/server.py
@@ -327,6 +327,7 @@ async def handle_request(self, request, request_type) -> Response:
 
 class RegularRequestHandler(BaseRequestHandler):
     async def handle_request(self, request, request_type) -> Response:
+        uid = None
         try:
             logger.debug(f"Handling request: {request}")
             # Prepare request
@@ -360,6 +361,10 @@ async def handle_request(self, request, request_type) -> Response:
             logger.error(f"Unhandled exception: {e}", exc_info=True)
             raise HTTPException(status_code=500, detail="Internal server error") from e
 
+        finally:
+            if uid is not None:
+                self.server.response_buffer.pop(uid, None)
+
     @staticmethod
     def _handle_error_response(response):
         """Raise HTTPException as is and rest as 500 after logging the error."""