diff --git a/apps/admin/src/components/OrderBox/ShipmentOptionsBox.vue b/apps/admin/src/components/OrderBox/ShipmentOptionsBox.vue
index 20ea4289f..106b794f8 100644
--- a/apps/admin/src/components/OrderBox/ShipmentOptionsBox.vue
+++ b/apps/admin/src/components/OrderBox/ShipmentOptionsBox.vue
@@ -15,7 +15,9 @@
             {{ translate('notification_order_exported') }}
           </template>
 
-          <ShipmentOptionsForm v-else />
+          <ShipmentOptionsForm
+            v-else
+            :order="data?.externalIdentifier" />
         </PdkCol>
       </PdkRow>
     </template>
diff --git a/apps/admin/src/components/common/ShipmentOptionsForm.vue b/apps/admin/src/components/common/ShipmentOptionsForm.vue
index 618a20def..fea31b406 100644
--- a/apps/admin/src/components/common/ShipmentOptionsForm.vue
+++ b/apps/admin/src/components/common/ShipmentOptionsForm.vue
@@ -5,12 +5,18 @@
 </template>
 
 <script lang="ts" setup>
+import {computed} from 'vue';
 import {get, isDef} from '@vueuse/core';
 import {MagicForm} from '@myparcel/vue-form-builder';
+import {type OneOrMore} from '@myparcel/ts-utils';
 import {createShipmentOptionsForm} from '../../forms';
 import {useOrdersData} from '../../composables';
 
-const queries = useOrdersData();
+const props = defineProps<{order: OneOrMore<string>}>();
 
-const shipmentOptionsForm = createShipmentOptionsForm(queries.map((data) => get(data.order)).filter(isDef));
+const shipmentOptionsForm = computed(() => {
+  const queries = useOrdersData(props.order);
+
+  return createShipmentOptionsForm(queries.map((data) => get(data.order)).filter(isDef));
+});
 </script>
diff --git a/apps/admin/src/components/modals/ShipmentOptionsModal.vue b/apps/admin/src/components/modals/ShipmentOptionsModal.vue
index 521f3aff6..a83397b46 100644
--- a/apps/admin/src/components/modals/ShipmentOptionsModal.vue
+++ b/apps/admin/src/components/modals/ShipmentOptionsModal.vue
@@ -4,7 +4,10 @@
     :actions="actions"
     :modal-key="AdminModalKey.ShipmentOptions"
     title="shipment_options_title">
-    <ShipmentOptionsModalForm />
+    <component
+      :is="ShipmentOptionsModalForm"
+      :key="JSON.stringify(orderIds)"
+      v-bind="{order: orderIds}" />
   </PdkModal>
 </template>
 
@@ -12,7 +15,6 @@
 import {computed, defineAsyncComponent} from 'vue';
 import {get} from '@vueuse/core';
 import {AdminModalKey} from '../../types';
-import {useQueryStore} from '../../stores';
 import {instantiateActions} from '../../services';
 import {useOrdersData, usePluginSettings} from '../../composables';
 import {
@@ -31,16 +33,15 @@ import {
 const ShipmentOptionsModalForm = defineAsyncComponent(() => import('./ShipmentOptionsModalForm.vue'));
 
 const pluginSettings = usePluginSettings();
-const queryStore = useQueryStore();
 
 const {orderMode} = pluginSettings.order;
 
-queryStore.registerOrderQueries();
+const ordersData = computed(() => useOrdersData());
 
-const ordersData = useOrdersData();
+const orderIds = computed(() => get(ordersData).map((data) => get(data.order)?.externalIdentifier));
 
 const actions = computed(() => {
-  const disabled = ordersData.some((data) => get(data.query.isLoading));
+  const disabled = get(ordersData).some((data) => get(data.query.isLoading));
 
   const actions = [
     modalCloseAction,
diff --git a/apps/admin/src/components/modals/ShipmentOptionsModalForm.vue b/apps/admin/src/components/modals/ShipmentOptionsModalForm.vue
index 5544e4645..3e3d806a8 100644
--- a/apps/admin/src/components/modals/ShipmentOptionsModalForm.vue
+++ b/apps/admin/src/components/modals/ShipmentOptionsModalForm.vue
@@ -1,12 +1,22 @@
 <template>
   <ShipmentOptionsForm
-    v-if="queries.some((data) => data.order)"
-    v-test="$.type.__name" />
+    v-if="orderIds.length"
+    v-test="$.type.__name"
+    :order="orderIds" />
 </template>
 
 <script setup lang="ts">
+import {computed} from 'vue';
+import {get} from '@vueuse/core';
+import {type OneOrMore} from '@myparcel/ts-utils';
 import ShipmentOptionsForm from '../common/ShipmentOptionsForm.vue';
 import {useOrdersData} from '../../composables';
 
-const queries = useOrdersData();
+const props = defineProps<{order: OneOrMore<string>}>();
+
+const orderIds = computed(() => {
+  return useOrdersData(props.order)
+    .filter((data) => get(data.order))
+    .map((data) => get(data.order)?.externalIdentifier);
+});
 </script>