diff --git a/gateway/core.py b/gateway/core.py
index 7e79d7f..3409ed9 100644
--- a/gateway/core.py
+++ b/gateway/core.py
@@ -85,7 +85,6 @@ def route(
         form_params: list[str] | None = None,
         body_params: list[str] | None = None,
         response_model: any = None,  # TODO: Make specific for pydantic models
-        response_class: any = None,  # TODO: Make specific for pydantic response classes
         tags: list[str] = None,
         dependencies: Sequence[params.Depends] | None = None,
         summary: str | None = None,
@@ -138,7 +137,6 @@ def route(
         path,
         status_code=status_code,
         response_model=response_model,
-        response_class=response_class,
         tags=tags,
         dependencies=dependencies,
         summary=summary,
diff --git a/gateway/routers/podorc.py b/gateway/routers/podorc.py
index c4c383b..92c4651 100644
--- a/gateway/routers/podorc.py
+++ b/gateway/routers/podorc.py
@@ -3,7 +3,6 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Path, Security
-from fastapi.responses import JSONResponse
 from starlette import status
 from starlette.requests import Request
 from starlette.responses import Response
@@ -25,7 +24,6 @@
     path="/{analysis_id}",
     status_code=status.HTTP_200_OK,
     service_url=gateway_settings.PODORC_SERVICE_URL,
-    response_class=JSONResponse,
 )
 async def create_analysis(
         request: Request,
@@ -41,7 +39,6 @@ async def create_analysis(
     path="/{analysis_id}/logs",
     status_code=status.HTTP_200_OK,
     service_url=gateway_settings.PODORC_SERVICE_URL,
-    response_class=JSONResponse,
 )
 async def get_analysis_logs(
         request: Request,
@@ -57,7 +54,6 @@ async def get_analysis_logs(
     path="/{analysis_id}/status",
     status_code=status.HTTP_200_OK,
     service_url=gateway_settings.PODORC_SERVICE_URL,
-    response_class=JSONResponse,
 )
 async def get_analysis_status(
         request: Request,
@@ -73,7 +69,6 @@ async def get_analysis_status(
     path="/{analysis_id}/pods",
     status_code=status.HTTP_200_OK,
     service_url=gateway_settings.PODORC_SERVICE_URL,
-    response_class=JSONResponse,
 )
 async def get_analysis_pods(
         request: Request,
@@ -89,7 +84,6 @@ async def get_analysis_pods(
     path="/{analysis_id}/stop",
     status_code=status.HTTP_200_OK,
     service_url=gateway_settings.PODORC_SERVICE_URL,
-    response_class=JSONResponse,
 )
 async def stop_analysis(
         request: Request,
@@ -105,7 +99,6 @@ async def stop_analysis(
     path="/{analysis_id}/delete",
     status_code=status.HTTP_200_OK,
     service_url=gateway_settings.PODORC_SERVICE_URL,
-    response_class=JSONResponse,
 )
 async def delete_analysis(
         request: Request,