[DS-1008] Fix db client