diff --git a/core/lib/Drupal/Core/CoreBundle.php b/core/lib/Drupal/Core/CoreBundle.php
index 01fb02914db2d9ccb6c08ecf67d3641586c045f4..d29da837e7c80c13d3d7dd52e4973fc3d81f3fc2 100644
--- a/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -101,7 +101,7 @@ public static function registerTwig(ContainerBuilder $container) {
         // @todo ensure garbage collection of expired files.
         // When in the installer, twig_cache must be FALSE until we know the
         // files folder is writable.
-        'cache' => ((MAINTENANCE_MODE != 'install') ? settings()->get('twig_cache', TRUE) : FALSE),
+        'cache' => drupal_installation_attempted() ? FALSE : settings()->get('twig_cache', TRUE),
         'base_template_class' => 'Drupal\Core\Template\TwigTemplate',
         // @todo Remove in followup issue
         // @see http://drupal.org/node/1712444.