Extend close handling so that multiple requests in queue are skipped