diff --git a/src/services/companyImport/orderImporter.js b/src/services/companyImport/orderImporter.js
index 4abe78c..35f76e7 100644
--- a/src/services/companyImport/orderImporter.js
+++ b/src/services/companyImport/orderImporter.js
@@ -242,25 +242,31 @@ export async function importOrders({
 
                 if (shippableLines.length > 0) {
                     try {
+                        const isSelbstabholer = (shippingType || '').trim().toLowerCase() === 'selbstabholer';
+                        const deliveryState = isShipped ? 'delivered' : 'new';
+
                         const shipment = await store.shipment.create(googleAuthId, {
                             orderId: createdOrder.id,
                             date: validDate,
+                            state: deliveryState,
                             lines: shippableLines,
                         });
 
-                        const trackingCode = cleanValue(m.trackingCode ?? m.tracking_code ?? m.cTracking);
-                        const carrier = cleanValue(m.carrier ?? m.cCarrier);
-                        const shippingState = isShipped ? 'shipped' : 'draft';
+                        if (!isSelbstabholer) {
+                            const trackingCode = cleanValue(m.trackingCode ?? m.tracking_code ?? m.cTracking);
+                            const carrier = cleanValue(m.carrier ?? m.cCarrier);
+                            const shippingState = isShipped ? 'shipped' : 'draft';
 
-                        await store.shipping.create(googleAuthId, {
-                            manifestId: shipment.id,
-                            type: shippingType || 'standard',
-                            state: shippingState,
-                            trackingCode: trackingCode || undefined,
-                            carrier: carrier || undefined,
-                            warehouseId: defaultWarehouseId || undefined,
-                        });
-                        shippingsImported++;
+                            await store.shipping.create(googleAuthId, {
+                                manifestId: shipment.id,
+                                type: shippingType || 'standard',
+                                state: shippingState,
+                                trackingCode: trackingCode || undefined,
+                                carrier: carrier || undefined,
+                                warehouseId: defaultWarehouseId || undefined,
+                            });
+                            shippingsImported++;
+                        }
                     } catch (err) {
                         log.warn(`Failed to create shipment/shipping for order ${orderNumber}:`, err.message);
                     }