diff --git a/core/modules/config/lib/Drupal/config/ConfigStorageController.php b/core/modules/config/lib/Drupal/config/ConfigStorageController.php
index 12d62b43697da302f862d4abb935d3c5956698f3..eecbd1dcdde48eaffd5544e47cdf804d876afac7 100644
--- a/core/modules/config/lib/Drupal/config/ConfigStorageController.php
+++ b/core/modules/config/lib/Drupal/config/ConfigStorageController.php
@@ -48,6 +48,13 @@ class ConfigStorageController implements StorageControllerInterface {
    */
   protected $idKey;
 
+  /**
+   * Name of the entity's UUID property.
+   *
+   * @var string
+   */
+  protected $uuidKey = 'uuid';
+
   /**
    * Implements Drupal\entity\StorageControllerInterface::__construct().
    *
@@ -58,9 +65,6 @@ public function __construct($entityType) {
     $this->entityInfo = entity_get_info($entityType);
     $this->hookLoadArguments = array();
     $this->idKey = $this->entityInfo['entity keys']['id'];
-
-    // The UUID key and property is hard-coded for all configurables.
-    $this->uuidKey = 'uuid';
   }
 
   /**