diff --git a/src/Context/FieldResolver.php b/src/Context/FieldResolver.php
index de2cb3b..b667ec4 100644
--- a/src/Context/FieldResolver.php
+++ b/src/Context/FieldResolver.php
@@ -101,7 +101,7 @@ class FieldResolver {
     $resource_types = [$resource_type];
     while ($field_name = array_shift($parts)) {
       $field_name = $this->getInternalName($field_name, $resource_types);
-      if (!$definitions = $this->fieldManager->getFieldStorageDefinitions($entity_type_id)) {
+      if (!$definitions = ($this->fieldManager->getFieldStorageDefinitions($entity_type_id) + $this->fieldManager->getBaseFieldDefinitions($entity_type_id))) {
         throw new BadRequestHttpException(sprintf(
           'Invalid nested filtering. There is no entity type "%s".',
           $entity_type_id