Fix: Handle disabled queues properly