diff --git a/src/Context/FieldResolver.php b/src/Context/FieldResolver.php
index d3bb6a1..e0d6e32 100644
--- a/src/Context/FieldResolver.php
+++ b/src/Context/FieldResolver.php
@@ -4,6 +4,7 @@ namespace Drupal\jsonapi\Context;
 
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Field\TypedData\FieldItemDataDefinition;
 use Drupal\Core\TypedData\DataReferenceTargetDefinition;
 use Drupal\jsonapi\ResourceType\ResourceType;
@@ -123,6 +124,11 @@ class FieldResolver {
       throw new BadRequestHttpException('No field name was provided for the filter.');
     }
 
+    $entity_type = \Drupal::entityTypeManager()->getDefinition($entity_type_id);
+    if (!$entity_type->entityClassImplements(FieldableEntityInterface::class)){
+      return $resource_type->getInternalName($external_field_name);
+    }
+
     // Turns 'uid.categories.name' into
     // 'uid.entity.field_category.entity.name'. This may be too simple, but it
     // works for the time being.