diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index c57a4b19a4..9995c719fb 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -202,6 +202,7 @@ p a {
 		<li>[Fix] Make the window showing file differences a little wider (Bug #13157)</li>
 		<li>[Fix] Preserve preview style on search form (Bug #13205)</li>
 		<li>[Fix] Place attachment filename in new line in posting editor (Bug #9726)</li>
+		<li>[Fix] Don't allow caching to occur in the update sequence (Bug #13207)</li>
 
 	</ul>
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 101ea8e0c6..e6eb9c2bbc 100755
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -225,6 +225,9 @@ $config = array(
 $template->set_custom_template('../adm/style', 'admin');
 $template->assign_var('T_TEMPLATE_PATH', '../adm/style');
 
+// the acp template is never stored in the database
+$user->theme['template_storedb'] = false;
+
 $install = new module();
 
 $install->create('install', "index.$phpEx", $mode, $sub);
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 0e97750c9f..2140e557e4 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -126,6 +126,9 @@ class install_update extends module
 		// Set custom template again. ;)
 		$template->set_custom_template('../adm/style', 'admin');
 
+		// still, the acp template is never stored in the database
+		$user->theme['template_storedb'] = false;
+
 		// Get current and latest version
 		if (($latest_version = $cache->get('_version_info')) === false)
 		{