diff --git a/src/I18n/I18nManager.tsx b/src/I18n/I18nManager.tsx
index 17868dbf7..e1a656e88 100644
--- a/src/I18n/I18nManager.tsx
+++ b/src/I18n/I18nManager.tsx
@@ -126,6 +126,9 @@ export default class I18nManager {
       (!options.compactThreshold || (options.compactThreshold && value > options.compactThreshold));
     const isCurrency = options.currency && options.style === NumberFormatStyleEnum.CURRENCY;
     options.currency = options.currency || I18nManager.currency;
+    if(!options.currency) {
+      delete options.currency
+    }
     const isUnit = options.unit && options.style === NumberFormatStyleEnum.UNIT;
     const isPercent = options.style === NumberFormatStyleEnum.PERCENT;
 
diff --git a/src/components/charging-station/ChargingStationComponent.tsx b/src/components/charging-station/ChargingStationComponent.tsx
index 16db0cb72..9f6780f7c 100644
--- a/src/components/charging-station/ChargingStationComponent.tsx
+++ b/src/components/charging-station/ChargingStationComponent.tsx
@@ -100,12 +100,10 @@ export default class ChargingStationComponent extends React.Component<Props, Sta
           </View>
         </View>
         <View style={style.subHeaderContent}>
-          {chargingStation.siteArea ? (
+          {chargingStation.siteArea && (
             <Text style={style.address} ellipsizeMode={'tail'} numberOfLines={1}>
               {Utils.formatAddress(chargingStation.siteArea.address)}
             </Text>
-          ) : (
-            <Text>-</Text>
           )}
           {chargingStation.distanceMeters > 0 && <Text style={style.distance}>{Utils.formatDistance(chargingStation.distanceMeters)}</Text>}
         </View>
diff --git a/src/components/charging-station/ChargingStationComponentStyles.tsx b/src/components/charging-station/ChargingStationComponentStyles.tsx
index bc2cde10b..0281d3886 100644
--- a/src/components/charging-station/ChargingStationComponentStyles.tsx
+++ b/src/components/charging-station/ChargingStationComponentStyles.tsx
@@ -40,7 +40,8 @@ export default function computeStyleSheet(): StyleSheet.NamedStyles<any> {
     },
     address: {
       color: commonColor.textColor,
-      fontSize: '12@s'
+      fontSize: '12@s',
+      flex: 1
     },
     distance: {
       color: commonColor.textColor
diff --git a/src/screens/statistics/Statistics.tsx b/src/screens/statistics/Statistics.tsx
index 35e644cf9..932cf7a0b 100644
--- a/src/screens/statistics/Statistics.tsx
+++ b/src/screens/statistics/Statistics.tsx
@@ -180,7 +180,7 @@ export default class Statistics extends BaseScreen<Props, State> {
       compactDisplay: 'long',
       compactThreshold: 1000000
     });
-    const totalCost = I18nManager.formatNumberWithCompacts(totalPrice, {
+    const totalCost = !isPricingActive ? null : I18nManager.formatNumberWithCompacts(totalPrice, {
       notation: NumberFormatNotationEnum.COMPACT,
       compactStyle: NumberFormatCompactStyleEnum.FINANCE,
       compactDisplay: 'short',