diff --git a/freqtrade/commands/data_commands.py b/freqtrade/commands/data_commands.py
index 4a37bdc08..d3f70b9ec 100644
--- a/freqtrade/commands/data_commands.py
+++ b/freqtrade/commands/data_commands.py
@@ -99,9 +99,10 @@ def start_list_data(args: Dict[str, Any]) -> None:
 
     config = setup_utils_configuration(args, RunMode.UTIL_NO_EXCHANGE)
 
-    from freqtrade.data.history.idatahandler import get_datahandlerclass
+    from freqtrade.data.history.idatahandler import get_datahandler
     from tabulate import tabulate
-    dhc = get_datahandlerclass(config['dataformat_ohlcv'])
+    dhc = get_datahandler(config['datadir'], config['dataformat_ohlcv'])
+
     paircombs = dhc.ohlcv_get_available_data(config['datadir'])
 
     print(f"Found {len(paircombs)} pair / timeframe combinations.")
diff --git a/freqtrade/data/history/idatahandler.py b/freqtrade/data/history/idatahandler.py
index e255710cb..96d288e01 100644
--- a/freqtrade/data/history/idatahandler.py
+++ b/freqtrade/data/history/idatahandler.py
@@ -34,7 +34,7 @@ class IDataHandler(ABC):
         """
         Returns a list of all pairs with ohlcv data available in this datadir
         :param datadir: Directory to search for ohlcv files
-        :return: List of Pair
+        :return: List of Tuples of (pair, timeframe)
         """
 
     @abstractclassmethod
diff --git a/freqtrade/data/history/jsondatahandler.py b/freqtrade/data/history/jsondatahandler.py
index 4ef35cf55..2e7c0f773 100644
--- a/freqtrade/data/history/jsondatahandler.py
+++ b/freqtrade/data/history/jsondatahandler.py
@@ -27,7 +27,7 @@ class JsonDataHandler(IDataHandler):
         """
         Returns a list of all pairs with ohlcv data available in this datadir
         :param datadir: Directory to search for ohlcv files
-        :return: List of Pair
+        :return: List of Tuples of (pair, timeframe)
         """
         _tmp = [re.search(r'^([a-zA-Z_]+)\-(\d+\S+)(?=.json)', p.name)
                 for p in datadir.glob(f"*.{cls._get_file_extension()}")]