CB-6285: fixed async issue with downloads