diff --git a/core/assets/scaffold/files/default.settings.php b/core/assets/scaffold/files/default.settings.php
index 447e94eef3b2c0e5a46133062cb320764dcd931e..5784a9c7523d52e39d652ce359be7fc8c4a3ebbb 100644
--- a/core/assets/scaffold/files/default.settings.php
+++ b/core/assets/scaffold/files/default.settings.php
@@ -591,7 +591,7 @@
  *
  * Note: This setting does not apply to installation and update pages.
  */
-# $settings['maintenance_theme'] = 'bartik';
+# $settings['maintenance_theme'] = 'claro';
 
 /**
  * PHP settings:
diff --git a/core/includes/theme.maintenance.inc b/core/includes/theme.maintenance.inc
index 32102337b4e802cc1df7df83703c21b212e248c3..c41c48469172b88836378eeadeb9b52b5ca84527 100644
--- a/core/includes/theme.maintenance.inc
+++ b/core/includes/theme.maintenance.inc
@@ -14,7 +14,7 @@
  * Used for site installs, updates and when the site is in maintenance mode.
  * It also applies when the database is unavailable or bootstrap was not
  * complete. Seven is always used for the initial install and update
- * operations. In other cases, Bartik is used, but this can be overridden by
+ * operations. In other cases, Claro is used, but this can be overridden by
  * setting a "maintenance_theme" key in the $settings variable in settings.php.
  */
 function _drupal_maintenance_theme() {
@@ -53,8 +53,8 @@ function _drupal_maintenance_theme() {
     }
     if (!$custom_theme) {
       // We have been unable to identify the configured theme, so fall back to
-      // a safe default. Bartik is reasonably user friendly and fairly generic.
-      $custom_theme = 'bartik';
+      // a safe default. Claro is reasonably user friendly and fairly generic.
+      $custom_theme = 'claro';
     }
   }
 
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 447e94eef3b2c0e5a46133062cb320764dcd931e..5784a9c7523d52e39d652ce359be7fc8c4a3ebbb 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -591,7 +591,7 @@
  *
  * Note: This setting does not apply to installation and update pages.
  */
-# $settings['maintenance_theme'] = 'bartik';
+# $settings['maintenance_theme'] = 'claro';
 
 /**
  * PHP settings: