diff --git a/View/ViewHandler.php b/View/ViewHandler.php
index 6e638fbb2..6d63ab6ce 100644
--- a/View/ViewHandler.php
+++ b/View/ViewHandler.php
@@ -189,7 +189,7 @@ public function createResponse(View $view, Request $request, string $format): Re
 
         $response = $this->initResponse($view, $format);
 
-        if (!$response->headers->has('Content-Type')) {
+        if (!$response->headers->has('Content-Type') && !in_array($response->getStatusCode(), [204, 304])) {
             $mimeType = $request->attributes->get('media_type');
             if (null === $mimeType) {
                 $mimeType = $request->getMimeType($format);