diff --git a/tasks/task_database.c b/tasks/task_database.c
index 2852ba5fe2..3219963a40 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -330,7 +330,10 @@ static int database_info_poll(db_handle_t *db)
    if (str_list->size > 1)
       strlcpy(elem1, str_list->elems[1].data, sizeof(elem1));
 
-   db->handle = database_info_dir_init(elem0, DATABASE_TYPE_ITERATE);
+   if (!strcmp(elem1, "cb_db_scan_file"))
+      db->handle = database_info_file_init(elem0, DATABASE_TYPE_ITERATE);
+   else if (!strcmp(elem1, "cb_db_scan_folder"))
+      db->handle = database_info_dir_init(elem0, DATABASE_TYPE_ITERATE);
 
    string_list_free(str_list);