diff --git a/Model/Api/Order/Helper.php b/Model/Api/Order/Helper.php
index b102838..c76b3ae 100644
--- a/Model/Api/Order/Helper.php
+++ b/Model/Api/Order/Helper.php
@@ -5,6 +5,7 @@
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\ResourceModel\GroupRepository;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\State;
 use Magento\Framework\HTTP\Header;
 use Magento\Framework\Locale\ResolverInterface;
@@ -99,6 +100,7 @@ class Helper
      * @var CustomerGroupFactory
      */
     private $_groupRepository;
+    private $request;
 
     /**
      * Helper constructor.
@@ -132,6 +134,7 @@ public function __construct(
         State $state,
         ResolverInterface $localeResolver,
         Header $httpHeader,
+        RequestInterface $request,
         Registry $registry
     ) {
         $this->_customerFactory = $customerFactory;
@@ -149,6 +152,7 @@ public function __construct(
         $this->localeResolver = $localeResolver;
         $this->httpHeader = $httpHeader;
         $this->registry = $registry;
+        $this->request = $request;
     }
 
     /**
@@ -638,13 +642,25 @@ public function getOrderFulfillments($createdShipment = null)
 
         foreach ($shipmentCollection as $shipment) {
             $tracking = $shipment->getTracksCollection()->getFirstItem();
+
+            if ($tracking->getId()) {
+                $title = $tracking->getTitle();
+                $trackingNumber = $tracking->getTrackNumber();
+            } else {
+                $tracking = $this->request->getParam('tracking');
+
+                if (!empty($tracking)) {
+                    $title = $tracking[1]['title'];
+                    $trackingNumber = $tracking[1]['number'];
+                }
+            }
             $comment = $shipment->getCommentsCollection()->getFirstItem();
             $payload = array(
                 "fulfillment_id" => $shipment->getIncrementId(),
                 "created_at" => $this->formatDateAsIso8601($shipment->getCreatedAt()),
                 "status" => "success",
-                "tracking_company" => $tracking->getTitle(),
-                "tracking_numbers" => $tracking->getTrackNumber(),
+                "tracking_company" => $title,
+                "tracking_numbers" => $trackingNumber,
                 "message" => $comment->getComment(),
                 "line_items" => $this->getAllShipmentItems($shipment)
             );
diff --git a/composer.json b/composer.json
index fb1a3e4..a757eaf 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "riskified/magento2new",
     "type": "magento2-module",
     "description": "Riskified decider module for Magento 2",
-    "version": "1.12.19",
+    "version": "1.12.20",
     "require": {
         "php": ">=7.4",
         "magento/framework": ">=100.1.0",
diff --git a/etc/di.xml b/etc/di.xml
index 7934b2d..f22211c 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -29,7 +29,6 @@
     <type name="Magento\Framework\Console\CommandListInterface">
         <arguments>
             <argument name="commands" xsi:type="array">
-                <item name="riskfied_send_historical_orders" xsi:type="object">Riskified\Decider\Model\Command\UploadHistoricalOrders</item>
                 <item name="release_on_hold_orders" xsi:type="object">Riskified\Decider\Model\Command\ReleaseOnHoldOrders</item>
             </argument>
         </arguments>