diff --git a/config/pdk-settings.php b/config/pdk-settings.php
index 238d126c7..d3a4aecbb 100644
--- a/config/pdk-settings.php
+++ b/config/pdk-settings.php
@@ -10,6 +10,7 @@
 use MyParcelNL\Pdk\Settings\SettingsManager;
 use MyParcelNL\Pdk\Shipment\Model\DeliveryOptions;
 use MyParcelNL\Pdk\Shipment\Model\DropOffDay;
+use MyParcelNL\Pdk\Types\Service\TriStateService;
 use function DI\factory;
 use function DI\value;
 
@@ -82,9 +83,10 @@
                 ],
             ],
             OrderSettings::ID   => [
-                SettingsManager::KEY_ALL => [
-                    OrderSettings::STATUS_ON_LABEL_CREATE => -1,
-                ],
+                OrderSettings::STATUS_ON_LABEL_CREATE    => TriStateService::INHERIT,
+                OrderSettings::STATUS_WHEN_LABEL_SCANNED => TriStateService::INHERIT,
+                OrderSettings::STATUS_WHEN_DELIVERED     => TriStateService::INHERIT,
+                OrderSettings::SEND_NOTIFICATION_AFTER   => TriStateService::INHERIT,
             ],
         ];
     }),