Make subscribe/unsubscribe idempotent