diff --git a/app/utils.js b/app/utils.js
index 6b2bae6..9aa50be 100644
--- a/app/utils.js
+++ b/app/utils.js
@@ -167,6 +167,9 @@ function formatCurrencyAmountWithForcedDecimalPlaces(amount, formatType, forcedD
 				dec = dec.times(global.exchangeRates[formatInfo.multiplier]);
 
 				return addThousandsSeparators(dec.toDecimalPlaces(decimalPlaces)) + " " + formatInfo.name;
+
+			} else {
+				return formatCurrencyAmountWithForcedDecimalPlaces(amount, coinConfig.defaultCurrencyUnit.name, forcedDecimalPlaces);
 			}
 		}
 	}
diff --git a/views/includes/value-display.pug b/views/includes/value-display.pug
index 5b698ac..b1ac85e 100644
--- a/views/includes/value-display.pug
+++ b/views/includes/value-display.pug
@@ -7,6 +7,9 @@ if (currencyValue > 0)
 		if (currencyFormatInfo.type == "native")
 			if (global.exchangeRates)
 				small.border-dotted.ml-1(data-toggle="tooltip", title=utils.formatExchangedCurrency(currencyValue, "usd")) #{parts[1]}
+
+			else
+				small.ml-1 #{parts[1]}
 					
 		else if (currencyFormatInfo.type == "exchanged")
 			small.border-dotted.ml-1(data-toggle="tooltip", title=utils.formatCurrencyAmount(currencyValue, coinConfig.defaultCurrencyUnit.name)) #{parts[1]}
diff --git a/views/layout.pug b/views/layout.pug
index 335d194..a080efc 100644
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -83,7 +83,7 @@ html(lang="en")
 									if (coinConfig.currencyUnits)
 										span(class="dropdown-header") Currency Units
 										each item in coinConfig.currencyUnits
-											if (item.type == "native" || config.queryExchangeRates)
+											if (item.type == "native" || (config.queryExchangeRates && !config.privacyMode))
 												a(class="dropdown-item", href=("/changeSetting?name=currencyFormatType&value=" + item.values[0]))
 													each valueName in item.values
 														if (currencyFormatType == valueName)