diff --git a/CHANGELOG-4.0.md b/CHANGELOG-4.0.md
index e8a2529c839..a71514d9748 100644
--- a/CHANGELOG-4.0.md
+++ b/CHANGELOG-4.0.md
@@ -1,2 +1,3 @@
 # [4.0.0](https://github.com/phalcon/cphalcon/releases/tag/v4.0.0) (2017-XX-XX)
 - MVC Application and Router now must have a URI to process [#12380](https://github.com/phalcon/cphalcon/pull/12380)
+- Response headers and cookies are no longer prematurely sent [#12378](https://github.com/phalcon/cphalcon/pull/12378)
diff --git a/phalcon/mvc/application.zep b/phalcon/mvc/application.zep
index 4b927f49a47..378f713be36 100644
--- a/phalcon/mvc/application.zep
+++ b/phalcon/mvc/application.zep
@@ -388,12 +388,6 @@ class Application extends BaseApplication
 			eventsManager->fire("application:beforeSendResponse", this, response);
 		}
 
-		/**
-		 * Headers and Cookies are automatically sent
-		 */
-		response->sendHeaders();
-		response->sendCookies();
-
 		/**
 		 * Return the response
 		 */