diff --git a/src/modules/02_organization/components/StructureOrgMain.vue b/src/modules/02_organization/components/StructureOrgMain.vue
index 746a25d21..0cd3704bc 100644
--- a/src/modules/02_organization/components/StructureOrgMain.vue
+++ b/src/modules/02_organization/components/StructureOrgMain.vue
@@ -199,8 +199,10 @@ watch(
         ? store.draftId
         : store.historyId;
 
-    fetchOrgChart();
-    fetchAgencyData(rootOrgID.value);
+    if (rootOrgID.value) {
+      fetchAgencyData(rootOrgID.value);
+      fetchOrgChart();
+    }
   }
 );
 
@@ -258,7 +260,7 @@ onBeforeMount(() => {
           @clear="() => (agencyId = '')"
           @update:model-value="onSelectAgency"
           @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn) "
-          style="width: 400px;"
+          style="width: 400px"
         >
           <template v-slot:no-option>
             <q-item>