diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index b3e2f4da91..c519388fa3 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -30,7 +30,7 @@
 			?>
 		<?php endforeach; ?>
 	</head>
-
+	<?php flush(); ?>
 	<body id="body-public">
 		<?php print_unescaped($_['content']); ?>
 	</body>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 5788d1d5bd..1f89e3f040 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -32,7 +32,7 @@
 			?>
 		<?php endforeach; ?>
 	</head>
-
+	<?php flush(); ?>
 	<body id="body-login">
 		<div class="wrapper"><!-- for sticky footer -->
 			<header><div id="header">
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index ba5f6ef9b5..a217446ca7 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -35,7 +35,7 @@
 			?>
 		<?php endforeach; ?>
 	</head>
-
+	<?php flush(); ?>
 	<body id="<?php p($_['bodyid']);?>">
 	<noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript to be enabled for correct operation.  Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and re-load this interface.')); ?></div></div></noscript>
 	<div id="notification-container">
