Fix API also when no data in DB and thus in request