diff --git a/src/Entity/Crop.php b/src/Entity/Crop.php
index 1cee3ee..5bb21aa 100644
--- a/src/Entity/Crop.php
+++ b/src/Entity/Crop.php
@@ -129,16 +129,19 @@ class Crop extends ContentEntityBase implements CropInterface {
    * {@inheritdoc}
    */
   public static function findCrop($uri, $type) {
-    $query = \Drupal::entityQuery('crop')
-      ->condition('uri', $uri);
+    $query = \Drupal::database()->select('crop_field_data', 'cfd')
+      ->addField('cfd', 'cid')
+      ->condition('cfd.uri', $uri, 'LIKE');
+
     if ($type) {
-      $query->condition('type', $type);
+      $query->condition('cfd.type', $type);
     }
-    $crop = $query->sort('cid')
-      ->range(0, 1)
-      ->execute();
 
-    return $crop ? \Drupal::entityTypeManager()->getStorage('crop')->load(current($crop)) : NULL;
+    $query->range(0, 1);
+    $crop = $query->execute()
+      ->fetchField();
+
+    return $crop ? \Drupal::entityTypeManager()->getStorage('crop')->load($crop) : NULL;
   }
 
   /**