diff --git a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
index bdd05c7..d9d51fe 100644
--- a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
@@ -102,7 +102,7 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
         // Deliver the 503 page if the site is in maintenance mode and the
         // logged in user is not allowed to bypass it.
         drupal_maintenance_theme();
-        $content = Xss::filterAdmin(String::format($this->config->get('system.maintenance')->get('message'), array(
+        $content = Xss::filterAdmin(String::format($this->config->getEditable('system.maintenance')->get('message'), array(
           '@site' => $this->config->get('system.site')->get('name'),
         )));
         $output = $this->bareHtmlPageRenderer->renderBarePage(['#markup' => $content], $this->t('Site under maintenance'), 'maintenance_page');
diff --git a/core/modules/system/src/Tests/System/SiteMaintenanceMultilingualTest.php b/core/modules/system/src/Tests/System/SiteMaintenanceMultilingualTest.php
new file mode 100644
index 0000000..c80674f
--- /dev/null
+++ b/core/modules/system/src/Tests/System/SiteMaintenanceMultilingualTest.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @file
+ * Definition of Drupal\system\Tests\System\SiteMaintenanceMultilingualTest.
+ */
+
+namespace Drupal\system\Tests\System;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests access to site while in maintenance mode in a multilingual environment.
+ *
+ * @group system
+ */
+class SiteMaintenanceMultilingualTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('node', 'locale');
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Configure 'node' as front page.
+    $this->config('system.site')->set('page.front', 'node')->save();
+
+    // Create a user allowed to access site in maintenance mode.
+    $this->user = $this->drupalCreateUser(array('access site in maintenance mode'));
+    // Create an administrative user.
+    $this->admin_user = $this->drupalCreateUser(array('administer site configuration', 'access site in maintenance mode', 'translate interface', 'administer languages'));
+    $this->drupalLogin($this->admin_user);
+  }
+
+  /**
+   * @inheritdoc
+   */
+  protected function installParameters() {
+    $parameters = parent::installParameters();
+    $parameters['parameters']['langcode'] = 'nl';
+    return $parameters;
+  }
+
+  /**
+   * Verify site maintenance mode functionality in a multilingual environment.
+   */
+  function testSiteMaintenanceMultilingual() {
+
+    $custom_user_message = t('Deze site is in onderhoud.');
+
+    // Set a custom Dutch maintenance message.
+    $edit = array(
+      'maintenance_mode' => 1,
+      'maintenance_mode_message' => $custom_user_message,
+    );
+    $this->drupalPostForm('admin/config/development/maintenance', $edit, t('Save configuration'));
+
+    // Logout and verify that custom site offline message is displayed.
+    $this->drupalLogout();
+    $this->drupalGet('');
+    $this->assertRaw($custom_user_message, 'Found the site offline message.');
+  }
+}