diff --git a/www/lib/class.remote.php b/www/lib/class.remote.php
index 15085ca7..091a7db2 100644
--- a/www/lib/class.remote.php
+++ b/www/lib/class.remote.php
@@ -2068,7 +2068,7 @@ class Remote
             $result = $this->sendlist($i, $id, $data, true);
           }
 
-        } while (count($data[$i]['matrix_varianten']['artikel'])>=5000);
+        } while (count($data[$i]['matrix_varianten']['artikel'] ?? [])>=5000);
 
         return $result;
       }
@@ -2325,7 +2325,7 @@ class Remote
           $data->orderStatus = OrderStatus::Imported;
 
       $sql = "
-        SELECT
+        SELECT DISTINCT
             v.id,
             v.tracking,
             v.tracking_link,
diff --git a/www/pages/shopimporter_shopware6.php b/www/pages/shopimporter_shopware6.php
index 777ce688..3a105896 100644
--- a/www/pages/shopimporter_shopware6.php
+++ b/www/pages/shopimporter_shopware6.php
@@ -3432,7 +3432,7 @@ class Shopimporter_Shopware6 extends ShopimporterBase
             $this->shopwareRequest('POST', '_action/order_delivery/'.$deliveryId.'/state/ship');
 
             $deliveryData = [
-                'trackingCodes' => [$data->getTrackingNumberList()]
+                'trackingCodes' => $data->getTrackingNumberList()
             ];
             $this->shopwareRequest('PATCH', 'order-delivery/'.$deliveryId,$deliveryData);
         }