diff --git a/docs/bot-optimization.md b/docs/bot-optimization.md
index ae6377bf5..f018d92a7 100644
--- a/docs/bot-optimization.md
+++ b/docs/bot-optimization.md
@@ -290,7 +290,7 @@ if self.dp:
     so please be aware of it and make sure to not "look into the future" to avoid surprises when running in dry/live mode).
 
 !!! Warning Warning in hyperopt
-    This option should only be used in `populate_indicators()` - since it pulls the historic data from disk each time, which would be a huge performance penalty during hyperopt.
+    This option cannot currently be used during hyperopt.
 
 #### Available Pairs
 
diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py
index 7c98bd3a7..293511fc0 100644
--- a/freqtrade/optimize/backtesting.py
+++ b/freqtrade/optimize/backtesting.py
@@ -69,8 +69,10 @@ class Backtesting(object):
         exchange_name = self.config.get('exchange', {}).get('name', 'bittrex').title()
         self.exchange = ExchangeResolver(exchange_name, self.config).exchange
         self.fee = self.exchange.get_fee()
-        self.dataprovider = DataProvider(self.config, self.exchange)
-        IStrategy.dp = self.dataprovider
+
+        if self.config.get('runmode') != RunMode.HYPEROPT:
+            self.dataprovider = DataProvider(self.config, self.exchange)
+            IStrategy.dp = self.dataprovider
 
         if self.config.get('strategy_list', None):
             # Force one interval