diff --git a/lib/public/appframework/controller.php b/lib/public/appframework/controller.php
index 398304e6febdbb4db805ad4f423463fd01b72191..00981df05baef9dab0d8f1a4b05f303bef4689ec 100644
--- a/lib/public/appframework/controller.php
+++ b/lib/public/appframework/controller.php
@@ -70,7 +70,7 @@ abstract class Controller {
 						$data->getData(),
 						$data->getStatus()
 					);
-					$response->setHeaders($data->getHeaders());
+					$response->setHeaders(array_merge($data->getHeaders(), $response->getHeaders()));
 					return $response;
 				} else {
 					return new JSONResponse($data);