diff --git a/core/lib/Drupal/Core/Config/Config.php b/core/lib/Drupal/Core/Config/Config.php
index 604c146beb..adefeeea54 100644
--- a/core/lib/Drupal/Core/Config/Config.php
+++ b/core/lib/Drupal/Core/Config/Config.php
@@ -140,13 +140,10 @@ public function setModuleOverride(array $data) {
    *   A string that maps to a key within the configuration data.
    *
    * @return mixed
-   *   The value of the override or NULL if not overwritten.
+   *   The value of the override or empty if not overwritten.
    */
   public function getOverrides($key = '') {
     $overrides = $this->mergeOverridesWithData([]);
-    if (empty($overrides)) {
-      return NULL;
-    }
     return NestedArray::getValue($overrides, $key ? explode('.', $key) : []);
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Config/ConfigTest.php b/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
index c679b3d3be..9e3b136672 100644
--- a/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
@@ -185,7 +185,7 @@ public function testOverrideData($data, $module_data, $setting_data) {
 
     // Save so that the original data is stored.
     $this->config->save();
-    $this->assertNull($this->config->getOverrides());
+    $this->assertEquals([], $this->config->getOverrides());
 
     // Set module override data and check value before and after save.
     $this->config->setModuleOverride($module_data);
@@ -197,7 +197,7 @@ public function testOverrideData($data, $module_data, $setting_data) {
 
     // Reset the module overrides.
     $this->config->setModuleOverride([]);
-    $this->assertNull($this->config->getOverrides());
+    $this->assertEquals([], $this->config->getOverrides());
 
     // Set setting override data and check value before and after save.
     $this->config->setSettingsOverride($setting_data);
@@ -247,10 +247,10 @@ public function testOverrideData($data, $module_data, $setting_data) {
     $this->config->setModuleOverride([]);
     $this->config->setSettingsOverride([]);
     $this->assertConfigDataEquals($data);
-    $this->assertNull($this->config->getOverrides());
+    $this->assertEquals([], $this->config->getOverrides());
     $this->config->save();
     $this->assertConfigDataEquals($data);
-    $this->assertNull($this->config->getOverrides());
+    $this->assertEquals([], $this->config->getOverrides());
   }
 
   /**