diff --git a/fastapi/routing.py b/fastapi/routing.py
index ac0c19d12..0d47c9b9a 100644
--- a/fastapi/routing.py
+++ b/fastapi/routing.py
@@ -403,13 +403,10 @@ def get_request_handler(
         }
         # If status_code was set, use it, otherwise use the default from the
         # response class, in the case of redirect it's 307
-        current_status_code = (
-            status_code if status_code else solved_result.response.status_code
-        )
-        if current_status_code is not None:
-            response_args["status_code"] = current_status_code
         if solved_result.response.status_code:
             response_args["status_code"] = solved_result.response.status_code
+        elif status_code is not None:
+            response_args["status_code"] = status_code
         content = await serialize_response(
             field=response_field,
             response_content=raw_response,