diff --git a/lib/routes.js b/lib/routes.js
index aaf4b7e5..9dbc57ee 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -48,20 +48,23 @@ function poll(req, res) {
   }
 
   var rate = rateRec.rates.ask;
+  var fiatRate = rateRec.rates.bid || rate;
+
   if (rate === null) return res.json({err: 'No rate available'});
+  if (!fiatRate)
+    logger.warn('No bid rate, using ask rate');
+
   var fiatBalance = plugins.fiatBalance(fingerprint);
   if (fiatBalance === null) return res.json({err: 'No balance available'});
 
   var config = plugins.getCachedConfig();
   var complianceSettings = config.exchanges.settings.compliance;
-
+  var fiatCommission = config.exchanges.settings.fiatCommission ||
+    config.exchanges.settings.commission;
   var response = {
     err: null,
     rate: rate * config.exchanges.settings.commission,
-
-    // TODO this should actually be based on the sell rate
-    fiatRate: rate / config.exchanges.settings.commission,
-
+    fiatRate: fiatRate / fiatCommission,
     fiat: fiatBalance,
     locale: config.brain.locale,
     txLimit: parseInt(complianceSettings.maximum.limit, 10),