Add disable flag for client shutdown