diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index b4dd4ee1b..6c941f59e 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -1,8 +1,6 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -14,15 +12,14 @@ const props = defineProps({
         type: String,
         required: true,
     },
+    states: {
+        type: Array,
+        default: () => [],
+    },
 });
-
-const states = ref([]);
-
-defineExpose({ states });
 </script>
 
 <template>
-    <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index ba74ba212..63fd035da 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -10,12 +10,13 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import ZoneDescriptorProxy from '../Zone/Card/ZoneDescriptorProxy.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import FetchData from 'src/components/FetchData.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const dataKey = 'ClaimList';
 
-const claimFilterRef = ref();
+const states = ref([]);
 const columns = computed(() => [
     {
         align: 'left',
@@ -81,8 +82,7 @@ const columns = computed(() => [
         align: 'left',
         label: t('claim.state'),
         format: ({ stateCode }) =>
-            claimFilterRef.value?.states.find(({ code }) => code === stateCode)
-                ?.description,
+            states.value?.find(({ code }) => code === stateCode)?.description,
         name: 'stateCode',
         chip: {
             condition: () => true,
@@ -92,7 +92,7 @@ const columns = computed(() => [
             name: 'claimStateFk',
             component: 'select',
             attrs: {
-                options: claimFilterRef.value?.states,
+                options: states.value,
                 optionLabel: 'description',
             },
         },
@@ -125,6 +125,7 @@ const STATE_COLOR = {
 </script>
 
 <template>
+    <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
     <VnSection
         :data-key="dataKey"
         :columns="columns"
@@ -135,7 +136,7 @@ const STATE_COLOR = {
         }"
     >
         <template #advanced-menu>
-            <ClaimFilter data-key="ClaimList" ref="claimFilterRef" />
+            <ClaimFilter :data-key ref="claimFilterRef" :states />
         </template>
         <template #body>
             <VnTable