[12.0 stable] Prevent deferred queue from growing

[12.0 stable] Prevent deferred queue from growing #799