diff --git a/src/Plugin/Condition/OrderHasBaseFieldValue.php b/src/Plugin/Condition/OrderHasBaseFieldValue.php
index 8f1a9e3..e1de4af 100644
--- a/src/Plugin/Condition/OrderHasBaseFieldValue.php
+++ b/src/Plugin/Condition/OrderHasBaseFieldValue.php
@@ -141,7 +141,7 @@ class OrderHasBaseFieldValue extends ConditionBase implements ContainerFactoryPl
     /** @var \Drupal\commerce_order\Entity\OrderInterface $commerce_order */
     $commerce_order = $this->getContextValue('commerce_order');
 
-    if ($commerce_order->hasField($this->configuration['base_field']) &&
+    if ($commerce_order->hasField($this->configuration['base_field']) && !$commerce_order->get($this->configuration['base_field'])->isEmpty() &&
       array_key_exists('value', $commerce_order->get($this->configuration['base_field'])->first()->getValue())) {
       $value = $commerce_order->get($this->configuration['base_field'])->first()->getValue()['value'];
 
diff --git a/src/Plugin/Condition/OrderHasProductVariationWithBaseFieldValue.php b/src/Plugin/Condition/OrderHasProductVariationWithBaseFieldValue.php
index 37238d7..73b4ecf 100644
--- a/src/Plugin/Condition/OrderHasProductVariationWithBaseFieldValue.php
+++ b/src/Plugin/Condition/OrderHasProductVariationWithBaseFieldValue.php
@@ -143,7 +143,7 @@ class OrderHasProductVariationWithBaseFieldValue extends ConditionBase implement
 
 
     foreach ($commerce_order->getItems() as $item) {
-      if ($item->getPurchasedEntity()->hasField($this->configuration['base_field']) &&
+      if ($item->getPurchasedEntity()->hasField($this->configuration['base_field']) && !$item->getPurchasedEntity()->get($this->configuration['base_field'])->isEmpty() &&
         array_key_exists('value', $item->getPurchasedEntity()->get($this->configuration['base_field'])->first()->getValue())) {
         $value = $item->getPurchasedEntity()->get($this->configuration['base_field'])->first()->getValue()['value'];