diff --git a/src/Calculator/Views/UnitConverter.xaml b/src/Calculator/Views/UnitConverter.xaml
index a8325a64..bf0151c0 100644
--- a/src/Calculator/Views/UnitConverter.xaml
+++ b/src/Calculator/Views/UnitConverter.xaml
@@ -428,11 +428,7 @@
                 </VisualState>
             </VisualStateGroup>
             <VisualStateGroup x:Name="CurrencySecondaryStatusStates">
-                <VisualState x:Name="NormalCurrencyStatus">
-                    <VisualState.Setters>
-                        <Setter Target="CurrencySecondaryStatusTextBlock.Visibility" Value="Collapsed"/>
-                    </VisualState.Setters>
-                </VisualState>
+                <VisualState x:Name="NormalCurrencyStatus"/>
                 <VisualState x:Name="ChargesMayApplyCurrencyStatus">
                     <VisualState.Setters>
                         <Setter Target="CurrencySecondaryStatus.Foreground" Value="{ThemeResource AppControlPageTextBaseHighColorBrush}"/>
@@ -622,8 +618,10 @@
                                          x:Uid="RefreshButtonText"
                                          Foreground="{ThemeResource SystemControlHyperlinkBaseHighBrush}"
                                          Click="CurrencyRefreshButton_Click"/>
-                        <TextBlock x:Name="CurrencySecondaryStatusTextBlock" Margin="0,7,0,0"
-                                   Style="{ThemeResource CaptionTextBlockStyle}">
+                        <TextBlock x:Name="CurrencySecondaryStatusTextBlock"
+                                   Margin="0,7,0,0"
+                                   Style="{ThemeResource CaptionTextBlockStyle}"
+                                   Visibility="Collapsed">
                             <Run x:Name="Spacing" Text="&#x200A;"/>
                             <Run x:Name="CurrencySecondaryStatus"
                                  FontWeight="SemiBold"
diff --git a/src/Calculator/Views/UnitConverter.xaml.cpp b/src/Calculator/Views/UnitConverter.xaml.cpp
index bc128683..dddd38eb 100644
--- a/src/Calculator/Views/UnitConverter.xaml.cpp
+++ b/src/Calculator/Views/UnitConverter.xaml.cpp
@@ -157,14 +157,14 @@ void UnitConverter::SetNormalCurrencyStatus()
 
 void UnitConverter::SetChargesMayApplyStatus()
 {
-    VisualStateManager::GoToState(this, ChargesMayApplyCurrencyStatus->Name, false);
     CurrencySecondaryStatus->Text = m_chargesMayApplyText;
+    VisualStateManager::GoToState(this, ChargesMayApplyCurrencyStatus->Name, false);
 }
 
 void UnitConverter::SetFailedToRefreshStatus()
 {
-    VisualStateManager::GoToState(this, FailedCurrencyStatus->Name, false);
     CurrencySecondaryStatus->Text = m_failedToRefreshText;
+    VisualStateManager::GoToState(this, FailedCurrencyStatus->Name, false);
 }
 
 void UnitConverter::InitializeOfflineStatusTextBlock()