would an additional check for settings.Marketplace make sense here? so we won't ever do this or have to check the waffle in amo