diff --git a/resources/scripts/components/estimate-invoice-common/ExchangeRateConverter.vue b/resources/scripts/components/estimate-invoice-common/ExchangeRateConverter.vue
index fe6d20db..9aeac9c5 100644
--- a/resources/scripts/components/estimate-invoice-common/ExchangeRateConverter.vue
+++ b/resources/scripts/components/estimate-invoice-common/ExchangeRateConverter.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script setup>
-import { watch, computed, ref, onMounted } from 'vue'
+import { watch, computed, ref, onBeforeUnmount } from 'vue'
 import { useGlobalStore } from '@/scripts/stores/global'
 import { useCompanyStore } from '@/scripts/stores/company'
 import { useExchangeRateStore } from '@/scripts/stores/exchange-rate'
@@ -110,7 +110,8 @@ watch(
   () => props.store[props.storeProp].currency_id,
   (v) => {
     onChangeCurrency(v)
-  }
+  },
+  { immediate: true }
 )
 watch(
   () => props.customerCurrency,
@@ -144,7 +145,7 @@ function setCustomerCurrency(v) {
 
 async function onChangeCurrency(v) {
   if (v !== companyCurrency.value.id) {
-    if (!props.isEdit) {
+    if (!props.isEdit && v) {
       await getCurrenctExchangeRate(v)
     }
 
@@ -170,4 +171,8 @@ function getCurrenctExchangeRate(v) {
       isFetching.value = false
     })
 }
+
+onBeforeUnmount(() => {
+  props.store.showExchangeRate = false
+})
 </script>