diff --git a/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php
index f4c752bb..aa0340b1 100644
--- a/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php
+++ b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php
@@ -71,8 +71,10 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface
         $cust_tag_info = [];
         if ($stype == ServiceType::BATTERY_REPLACEMENT_NEW)
         {
-            error_log('calling getCustomerTagInfo');
-            $cust_tag_info = $this->getCustomerTagInfo($cv);
+            // check if criteria has entries
+            $entries = $criteria->getEntries();
+            if (!empty($entries))
+                $cust_tag_info = $this->getCustomerTagInfo($cv);
         }
         // error_log($stype);
         switch ($stype)