diff --git a/src/Form/PriceListItemInlineForm.php b/src/Form/PriceListItemInlineForm.php
index f1ba738..05bcfb8 100644
--- a/src/Form/PriceListItemInlineForm.php
+++ b/src/Form/PriceListItemInlineForm.php
@@ -102,9 +102,9 @@ class PriceListItemInlineForm extends EntityInlineForm {
     }
     if ($target_id) {
       $entity_storage = \Drupal::entityManager()->getStorage($target_type);
-      $entity_service = \Drupal::service('commerce_pricelist.default_base_price_resolver');
-      $price = $entity_service->getPrice($entity_storage->load($target_id));
-      if ($price->getNumber() == '0.00') {
+      $purchased_entity = $entity_storage->load($target_id);
+      $price = $purchased_entity->getPrice();
+      if (!$price) {
         $entity_form['price']['#disabled'] = true;
       }
     }
@@ -150,10 +150,8 @@ class PriceListItemInlineForm extends EntityInlineForm {
 
     // set price if price is null
     if ($product && !$entity->getPrice()) {
-      $entity_service = \Drupal::service('commerce_pricelist.default_base_price_resolver');
-      $price = $entity_service->getPrice($product);
-      if ($price->getNumber() != '0.00') {
-        $entity->setPrice($price);
+      if ($product->getPrice()) {
+        $entity->setPrice($product->getPrice());
       }
     }
 
diff --git a/src/Resolver/PriceListDefaultBasePriceResolver.php b/src/Resolver/PriceListDefaultBasePriceResolver.php
index 5be0c78..6a355c6 100644
--- a/src/Resolver/PriceListDefaultBasePriceResolver.php
+++ b/src/Resolver/PriceListDefaultBasePriceResolver.php
@@ -27,16 +27,16 @@ class PriceListDefaultBasePriceResolver implements PriceListPriceResolverInterfa
       return;
     }
 
-    /** @var \Drupal\commerce_price\Price $sale_price */
-    $sale_price = $entity->get('bundle_price')->first()->toPrice();
-    $sale_price_number = $sale_price->getNumber();
-    $sale_price_currency_code = $sale_price->getCurrencyCode();
+    /** @var \Drupal\commerce_price\Price $bundle_price */
+    $bundle_price = $entity->get('bundle_price')->first()->toPrice();
+    $bundle_price_number = $bundle_price->getNumber();
+    $bundle_price_currency_code = $bundle_price->getCurrencyCode();
 
-    if (!$sale_price_number || $sale_price_number == 0) {
+    if (!$bundle_price_number || $bundle_price_currency_code == 0) {
       return;
     }
 
-    return new Price($sale_price_number, $sale_price_currency_code);
+    return new Price($bundle_price_number, $bundle_price_currency_code);
   }
 
   /**