diff --git a/core/includes/schema.inc b/core/includes/schema.inc
index 0111adf22a..58c1a0f17a 100644
--- a/core/includes/schema.inc
+++ b/core/includes/schema.inc
@@ -85,11 +85,9 @@ function drupal_get_installed_schema_version($module, $reset = FALSE, $array = F
   if (!$versions) {
     $versions = \Drupal::keyValue('system.schema')->getAll();
     $enabled_modules = \Drupal::moduleHandler()->getModuleList();
-    array_walk($enabled_modules, function (&$value) {
-      $value = \Drupal::CORE_MINIMUM_SCHEMA_VERSION;
-    });
+    $enabled_modules = array_fill_keys(array_keys($enabled_modules), \Drupal::CORE_MINIMUM_SCHEMA_VERSION);
     $versions = array_merge($enabled_modules, $versions);
-    if (!$versions = \Drupal::keyValue('system.schema')->getAll()) {
+    if (!$versions) {
       $versions = [];
     }
   }
diff --git a/core/includes/update.inc b/core/includes/update.inc
index 4f34dbd4ac..e04e4103f3 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -608,7 +608,7 @@ function update_retrieve_dependencies() {
   $return = [];
   // Get a list of installed modules, arranged so that we invoke their hooks in
   // the same order that \Drupal::moduleHandler()->invokeAll() does.
-  foreach (\Drupal::keyValue('system.schema')->getAll() as $module => $schema) {
+  foreach (drupal_get_installed_schema_version(NULL, FALSE, TRUE) as $module => $schema) {
     if ($schema == SCHEMA_UNINSTALLED) {
       // Nothing to upgrade.
       continue;