diff --git a/frontend/app/composables/usePieceEdit.ts b/frontend/app/composables/usePieceEdit.ts
index 6520957..4298478 100644
--- a/frontend/app/composables/usePieceEdit.ts
+++ b/frontend/app/composables/usePieceEdit.ts
@@ -83,10 +83,6 @@ export function usePieceEdit(pieceId: string) {
   const constructeurIdsFromForm = computed(() => constructeurIdsFromLinks(constructeurLinks.value))
   const productSelections = ref<(string | null)[]>([])
 
-  const resolvedStructure = computed<PieceModelStructure | null>(() =>
-    pieceTypeDetails.value?.structure ?? selectedType.value?.structure ?? null,
-  )
-
   const {
     fields: customFieldInputs,
     requiredFilled: requiredCustomFieldsFilled,
@@ -176,6 +172,10 @@ export function usePieceEdit(pieceId: string) {
     return pieceTypeList.value.find((type) => type.id === selectedTypeId.value) ?? null
   })
 
+  const resolvedStructure = computed<PieceModelStructure | null>(() =>
+    pieceTypeDetails.value?.structure ?? selectedType.value?.structure ?? null,
+  )
+
   const structureProducts = computed(() =>
     getStructureProducts(resolvedStructure.value),
   )