diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index 23b1ab1d4..124ee2529 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onBeforeMount, ref, watch } from 'vue';
+import { ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import FetchData from 'components/FetchData.vue';
@@ -7,7 +7,6 @@ import FetchData from 'components/FetchData.vue';
 import axios from 'axios';
 import CustomerAddressForm from '../components/CustomerAddressForm.vue';
 import CustomerAddressEdit from '../components/CustomerAddressEdit.vue';
-import { onMounted } from 'vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -81,7 +80,8 @@ const getClientData = async (id) => {
 };
 
 const isDefaultAddress = (address) => {
-    return client?.value?.defaultAddressFk === address.id ? 1 : 0;
+    address.isDefaultAddress = client?.value?.defaultAddressFk === address.id ? 1 : 0;
+    return address.isDefaultAddress;
 };
 
 const setDefault = (address) => {
diff --git a/src/pages/Customer/components/CustomerAddressForm.vue b/src/pages/Customer/components/CustomerAddressForm.vue
index 0d8d8d950..7b285b6da 100644
--- a/src/pages/Customer/components/CustomerAddressForm.vue
+++ b/src/pages/Customer/components/CustomerAddressForm.vue
@@ -70,10 +70,8 @@ function handleLocation(data, location) {
                     unchecked-icon="star"
                     indeterminate-icon="star"
                     size="lg"
-                    :style="{
-                        'font-variation-settings': `'FILL' ${data.isDefaultAddress ? 1 : 0}`,
-                    }"
                     color="primary"
+                    :class="{ 'fill-icon': !!data.isDefaultAddress }"
                 />
                 <QCheckbox :label="t('Enabled')" v-model="data.isActive" />
                 <QCheckbox