diff --git a/src/stac_auth_proxy/utils/middleware.py b/src/stac_auth_proxy/utils/middleware.py
index db75449..ca0f17b 100644
--- a/src/stac_auth_proxy/utils/middleware.py
+++ b/src/stac_auth_proxy/utils/middleware.py
@@ -1,13 +1,17 @@
 """Utilities for middleware response handling."""
 
 import json
+import logging
 from abc import ABC, abstractmethod
 from typing import Any, Optional
 
 from starlette.datastructures import MutableHeaders
 from starlette.requests import Request
+from starlette.responses import JSONResponse
 from starlette.types import ASGIApp, Message, Receive, Scope, Send
 
+logger = logging.getLogger(__name__)
+
 
 class JsonResponseMiddleware(ABC):
     """Base class for middleware that transforms JSON response bodies."""
@@ -78,7 +82,18 @@ async def transform_response(message: Message) -> None:
 
             # Transform the JSON body
             if body:
-                data = json.loads(body)
+                try:
+                    data = json.loads(body)
+                except json.JSONDecodeError as e:
+                    logger.error("Error parsing JSON: %s", e)
+                    logger.error("Body: %s", body)
+                    logger.error("Response scope: %s", scope)
+                    response = JSONResponse(
+                        {"error": "Received invalid JSON from upstream server"},
+                        status_code=502,
+                    )
+                    await response(scope, receive, send)
+                    return
                 transformed = self.transform_json(data, request=request)
                 body = json.dumps(transformed).encode()