diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index b2aabd5b..444aa90a 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -1026,7 +1026,14 @@ class APIController extends Controller implements LoggedController
                 break;
         }
 
-        $icrit->addEntry($batt, $trade_in, 1);
+        // right now, the app does not include trade-ins but this might change in the future
+        if (empty($trade_in))
+            $icrit->addEntry($batt, null, 1);
+        else
+            $icrit->addEntry($batt, $trade_in, 1);
+
+        // set if taxable
+        $icrit->setIsTaxable();
 
         // send to invoice generator
         $invoice = $ic->generateInvoice($icrit);
@@ -1307,6 +1314,9 @@ class APIController extends Controller implements LoggedController
         $icrit->addBattery($batt);
         */
 
+        // set taxable
+        $icrit->setIsTaxable(true);
+
         // check trade-in
         // only allow motolite, other, none
         $trade_in = $req->request->get('trade_in');
@@ -1321,7 +1331,11 @@ class APIController extends Controller implements LoggedController
                 break;
         }
 
-        $icrit->addEntry($batt, $trade_in, 1);
+        // right now, the app does not include trade-ins but this might change in the future
+        if (empty($trade_in))
+            $icrit->addEntry($batt, null, 1);
+        else
+            $icrit->addEntry($batt, $trade_in, 1);
 
         // send to invoice generator
         $invoice = $ic->generateInvoice($icrit);
diff --git a/src/Controller/CustomerAppAPI/InvoiceController.php b/src/Controller/CustomerAppAPI/InvoiceController.php
index ef0cf6b2..a89f0950 100644
--- a/src/Controller/CustomerAppAPI/InvoiceController.php
+++ b/src/Controller/CustomerAppAPI/InvoiceController.php
@@ -92,7 +92,11 @@ class InvoiceController extends ApiController
                 break;
         }
 
-        $icrit->addEntry($batt, $trade_in, 1);
+        // right now, the app does not include trade-ins but this might change in the future
+        if (empty($trade_in))
+            $icrit->addEntry($batt, null, 1);
+        else
+            $icrit->addEntry($batt, $trade_in, 1);
 
         // set if taxable
         $icrit->setIsTaxable();
diff --git a/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php b/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
index f992f6e5..66d91060 100644
--- a/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
@@ -874,7 +874,12 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
 
         if ($battery != null)
         {
-            $crit->addEntry($battery, $trade_in, 1);
+            // right now, the app does not include trade-ins but this might change in the future
+            if ($trade_in == null)
+                $icrit->addEntry($batt, null, 1);
+            else
+                $icrit->addEntry($batt, $trade_in, 1);
+
             // error_log('adding entry for battery - ' . $battery->getID());
         }