@jfsimon I think the issue might be here: you are setting it to ``null``, but then, the corresponding code was previously ``null === $this->domain`` and is now replaced by ``!$this->scope->has('domain')`` (which is false as it has a ``null`` value)