added check to ignore whitelist if unset