diff --git a/src/components/ui/VnCurrency.vue b/src/components/ui/VnCurrency.vue
index 08c63df2d..999028805 100644
--- a/src/components/ui/VnCurrency.vue
+++ b/src/components/ui/VnCurrency.vue
@@ -72,7 +72,7 @@ function getForeignFieldComputed() {
     <span :title="toCurrencyLabel">
         <template v-if="currency && (localValue || localValue === 0)">
             {{
-                foreignValue && user.foreignCurrency
+                foreignValue && user.foreignCurrency && currency != user.currencyCode
                     ? toCurrencyLabel
                     : toCurrency(localValue)
             }}
diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index 4d251f0e5..1f7862651 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -76,6 +76,7 @@ export function useSession() {
                 lang: '',
                 darkMode: null,
                 foreignCurrency: true,
+                currencyCode: 'EUR', //FIXME: use config
             });
 
             stopRenewer();