diff --git a/core/includes/install.inc b/core/includes/install.inc
index 4dc2b56..e247378 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -617,14 +617,9 @@ function drupal_install_system($install_state) {
   \Drupal::service('router.builder')->rebuild();
 
   // Ensure default language is saved.
-  $system_site = \Drupal::configFactory()->getEditable('system.site');
   if (isset($install_state['parameters']['langcode'])) {
-    $system_site->set('langcode', $install_state['parameters']['langcode'])
-      ->save();
-  }
-  $name = $system_site->get('name');
-  if (empty($name)) {
-    $system_site->set('name', 'Drupal')
+    \Drupal::configFactory()->getEditable('system.site')
+      ->set('langcode', $install_state['parameters']['langcode'])
       ->save();
   }
 }
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 4a8683e..94c8e33 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -644,10 +644,13 @@ function system_install() {
   $cron_key = Crypt::randomBytesBase64(55);
   \Drupal::state()->set('system.cron_key', $cron_key);
 
-  // Populate the site UUID.
-  \Drupal::configFactory()->getEditable('system.site')
-    ->set('uuid', \Drupal::service('uuid')->generate())
-    ->save();
+  // Populate the site UUID and default name (if not set).
+  $site = \Drupal::configFactory()->getEditable('system.site');
+  $site->set('uuid', \Drupal::service('uuid')->generate());
+  if (!$site->get('name')) {
+    $site->set('name', 'Drupal');
+  }
+  $site->save();
 }
 
 /**