diff --git a/classes/Modules/Onlineshop/Data/Shipment.php b/classes/Modules/Onlineshop/Data/Shipment.php
index 87daeed5..c85959db 100644
--- a/classes/Modules/Onlineshop/Data/Shipment.php
+++ b/classes/Modules/Onlineshop/Data/Shipment.php
@@ -14,17 +14,17 @@ class Shipment
     public int $id;
 
     /**
-     * @var string plain tracking number
+     * @var ?string plain tracking number
      */
-    public string $trackingNumber;
+    public ?string $trackingNumber;
 
     /**
-     * @var string URL to view tracking details
+     * @var ?string URL to view tracking details
      */
-    public string $trackingUrl;
+    public ?string $trackingUrl;
 
     /**
-     * @var string shipping method (after mapping to Shop domain)
+     * @var ?string shipping method (after mapping to Shop domain)
      */
-    public string $shippingMethod;
+    public ?string $shippingMethod;
 }
\ No newline at end of file
diff --git a/www/lib/class.remote.php b/www/lib/class.remote.php
index 091a7db2..6401a427 100644
--- a/www/lib/class.remote.php
+++ b/www/lib/class.remote.php
@@ -2342,7 +2342,7 @@ class Remote
             vlp.versandpaket = v.id OR v.lieferschein_ohne_pos = l.id
         LEFT JOIN shopexport_versandarten sv ON
             sv.versandart_wawision = v.versandart AND sv.shop = $shopId
-        WHERE a.id = $orderId OR a.teillieferungvon = $orderId
+        WHERE (a.id = $orderId OR a.teillieferungvon = $orderId) AND v.id IS NOT NULL
         ORDER BY v.id";
 
       $shipments = $this->app->DB->SelectArr($sql);