Reafactored null values queue drain