diff --git a/src/Context/FieldResolver.php b/src/Context/FieldResolver.php
index b50dd3e..669f1c8 100644
--- a/src/Context/FieldResolver.php
+++ b/src/Context/FieldResolver.php
@@ -5,6 +5,7 @@ namespace Drupal\jsonapi\Context;
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\TypedData\DataReferenceTargetDefinition;
 use Drupal\jsonapi\ResourceType\ResourceType;
 use Drupal\jsonapi\ResourceType\ResourceTypeRepositoryInterface;
@@ -101,7 +102,11 @@ class FieldResolver {
     $resource_types = [$resource_type];
     while ($field_name = array_shift($parts)) {
       $field_name = $this->getInternalName($field_name, $resource_types);
-      $definitions = $this->fieldManager->getFieldStorageDefinitions($entity_type_id)
+        $bundle_field_definitions = array_filter($this->fieldManager->getFieldDefinitions($entity_type_id, $bundle), function($element){
+         return ($element instanceof BaseFieldDefinition) ? $element : false;
+        });
+        $definitions = $bundle_field_definitions
+        + $this->fieldManager->getFieldStorageDefinitions($entity_type_id)
         // We also need the base field definitions in case there are
         // relationships coming from computed fields.
         + $this->fieldManager->getBaseFieldDefinitions($entity_type_id);