diff --git a/core/modules/system/src/Controller/EntityAutocompleteController.php b/core/modules/system/src/Controller/EntityAutocompleteController.php
index 88fae84..44b6596 100644
--- a/core/modules/system/src/Controller/EntityAutocompleteController.php
+++ b/core/modules/system/src/Controller/EntityAutocompleteController.php
@@ -90,8 +90,8 @@ public function handleAutocomplete(Request $request, $target_type, $selection_ha
 
       // Selection settings are passed in as a hashed key of a serialized array
       // stored in the key/value store.
-      if ($this->keyValue->has($selection_settings_key)) {
-        $selection_settings = $this->keyValue->get($selection_settings_key);
+      $selection_settings = $this->keyValue->get($selection_settings_key, FALSE);
+      if ($selection_settings !== FALSE) {
         $selection_settings_hash = Crypt::hmacBase64(serialize($selection_settings) . $target_type . $selection_handler, Settings::getHashSalt());
         if ($selection_settings_hash !== $selection_settings_key) {
           // Disallow access when the selection settings hash does not match the