diff --git a/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php b/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php
index bceca12..47fa7b1 100644
--- a/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php
+++ b/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php
@@ -71,4 +71,15 @@ public function submitForm(array &$form, array &$form_state) {
     drupal_set_message($this->t('The configuration options have been saved.'));
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function config() {
+    if (!$this->configFactory) {
+      $container = $this->container();
+      $this->configFactory = $container->get('config.factory');
+      $this->configFactory->enterContext($container->get('config.context.free'));
+    }
+    return $this->configFactory;
+  }
 }