diff --git a/core/lib/Drupal/Core/TypedData/ComplexDataDefinitionBase.php b/core/lib/Drupal/Core/TypedData/ComplexDataDefinitionBase.php
index 1fa5dabb30f..37114dba33a 100644
--- a/core/lib/Drupal/Core/TypedData/ComplexDataDefinitionBase.php
+++ b/core/lib/Drupal/Core/TypedData/ComplexDataDefinitionBase.php
@@ -28,11 +28,9 @@ abstract class ComplexDataDefinitionBase extends DataDefinition implements Compl
    * {@inheritdoc}
    */
   public function getPropertyDefinition($name) {
-    if (!isset($this->propertyDefinitions)) {
-      $this->getPropertyDefinitions();
-    }
-    if (isset($this->propertyDefinitions[$name])) {
-      return $this->propertyDefinitions[$name];
+    $definitions = $this->getPropertyDefinitions();
+    if (isset($definitions[$name])) {
+      return $definitions[$name];
     }
   }