diff --git a/client/viewmodel/calculator/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt b/client/viewmodel/calculator/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt
index 1a717eda2..c822040e8 100644
--- a/client/viewmodel/calculator/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt
+++ b/client/viewmodel/calculator/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt
@@ -82,6 +82,7 @@ class CalculatorViewModel(
         .distinctUntilChanged()
         .onEach {
             Logger.d { "CalculatorViewModel observeBase $it" }
+            calculationStorage.currentBase = it
             currentBaseChanged(it)
         }
         .launchIn(viewModelScope)
@@ -173,7 +174,6 @@ class CalculatorViewModel(
     private fun currentBaseChanged(newBase: String) =
         viewModelScope.launch {
             data.conversion = null
-            calculationStorage.currentBase = newBase
             val symbol = currencyDataSource.getCurrencyByCode(newBase)?.symbol.orEmpty()
             setState {
                 copy(