Adding a check to only watch the domain if enabled