diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py
index 56ace2ae2..7c955d423 100644
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -397,7 +397,7 @@ class FreqtradeBot(object):
             return order_amount
 
         # use fee from order-dict if possible
-        if 'fee' in order and order['fee']:
+        if 'fee' in order and order['fee'] and (order['fee'].keys() >= {'currency', 'cost'}):
             if trade.pair.startswith(order['fee']['currency']):
                 new_amount = order_amount - order['fee']['cost']
                 logger.info("Applying fee on amount for %s (from %s to %s) from Order",
@@ -414,7 +414,7 @@ class FreqtradeBot(object):
         fee_abs = 0
         for exectrade in trades:
             amount += exectrade['amount']
-            if "fee" in exectrade:
+            if "fee" in exectrade and (exectrade['fee'].keys() >= {'currency', 'cost'}):
                 # only applies if fee is in quote currency!
                 if trade.pair.startswith(exectrade['fee']['currency']):
                     fee_abs += exectrade['fee']['cost']