diff --git a/freqtrade/data/history.py b/freqtrade/data/history.py
index e0f9f67db..29a7f3478 100644
--- a/freqtrade/data/history.py
+++ b/freqtrade/data/history.py
@@ -122,21 +122,29 @@ def load_data(datadir: Optional[Path],
               refresh_pairs: bool = False,
               exchange: Optional[Exchange] = None,
               timerange: TimeRange = TimeRange(None, None, 0, 0),
-              fill_up_missing: bool = True) -> Dict[str, DataFrame]:
+              fill_up_missing: bool = True,
+              live: bool = False
+              ) -> Dict[str, DataFrame]:
     """
     Loads ticker history data for a list of pairs the given parameters
     :return: dict(<pair>:<tickerlist>)
     """
     result = {}
+    if live:
+        logger.info('Live: Downloading data for all defined pairs ...')
+        exchange.refresh_latest_ohlcv([(pair, ticker_interval) for pair in pairs])
+        result = {key[0]: value for key, value in exchange._klines.items() if value is not None}
+    else:
+        logger.info('Using local backtesting data ...')
 
-    for pair in pairs:
-        hist = load_pair_history(pair=pair, ticker_interval=ticker_interval,
-                                 datadir=datadir, timerange=timerange,
-                                 refresh_pairs=refresh_pairs,
-                                 exchange=exchange,
-                                 fill_up_missing=fill_up_missing)
-        if hist is not None:
-            result[pair] = hist
+        for pair in pairs:
+            hist = load_pair_history(pair=pair, ticker_interval=ticker_interval,
+                                     datadir=datadir, timerange=timerange,
+                                     refresh_pairs=refresh_pairs,
+                                     exchange=exchange,
+                                     fill_up_missing=fill_up_missing)
+            if hist is not None:
+                result[pair] = hist
     return result
 
 
diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py
index bdd42943b..76c6556fa 100644
--- a/freqtrade/optimize/backtesting.py
+++ b/freqtrade/optimize/backtesting.py
@@ -401,24 +401,17 @@ class Backtesting(object):
         logger.info('Using stake_currency: %s ...', self.config['stake_currency'])
         logger.info('Using stake_amount: %s ...', self.config['stake_amount'])
 
-        if self.config.get('live'):
-            logger.info('Downloading data for all pairs in whitelist ...')
-            self.exchange.refresh_latest_ohlcv([(pair, self.ticker_interval) for pair in pairs])
-            data = {key[0]: value for key, value in self.exchange._klines.items()}
-
-        else:
-            logger.info('Using local backtesting data (using whitelist in given config) ...')
-
-            timerange = Arguments.parse_timerange(None if self.config.get(
-                'timerange') is None else str(self.config.get('timerange')))
-            data = history.load_data(
-                datadir=Path(self.config['datadir']) if self.config.get('datadir') else None,
-                pairs=pairs,
-                ticker_interval=self.ticker_interval,
-                refresh_pairs=self.config.get('refresh_pairs', False),
-                exchange=self.exchange,
-                timerange=timerange
-            )
+        timerange = Arguments.parse_timerange(None if self.config.get(
+            'timerange') is None else str(self.config.get('timerange')))
+        data = history.load_data(
+            datadir=Path(self.config['datadir']) if self.config.get('datadir') else None,
+            pairs=pairs,
+            ticker_interval=self.ticker_interval,
+            refresh_pairs=self.config.get('refresh_pairs', False),
+            exchange=self.exchange,
+            timerange=timerange,
+            live=self.config.get('live', False)
+        )
 
         if not data:
             logger.critical("No data found. Terminating.")