diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
index 134eb5e..65a3935 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -174,9 +174,7 @@ public function __construct(EntityTypeInterface $entity_type, Connection $databa
     $this->languageManager = $language_manager;
 
     // Maintain backwards compatibility, remove in D9.
-    if (!$uuid_generator) {
-      $this->uuidService = \Drupal::service('uuid');
-    }
+    $this->uuidService = $uuid_generator ?: \Drupal::service('uuid');
     $this->initTableLayout();
   }