diff --git a/src/Entity/FieldableEdgeEntityBase.php b/src/Entity/FieldableEdgeEntityBase.php
index 0a0a391a4..e1b78e239 100644
--- a/src/Entity/FieldableEdgeEntityBase.php
+++ b/src/Entity/FieldableEdgeEntityBase.php
@@ -569,7 +569,7 @@ public function &__get($name) {
     if (!isset($this->fieldDefinitions)) {
       $this->getFieldDefinitions();
     }
-    if (isset($this->fieldDefinitions[$name])) {
+    if (isset($this->fieldDefinitions[$name]) && !($this->fieldDefinitions[$name] instanceof BaseFieldDefinition)) {
       $return = $this->getField($name);
       return $return;
     }