LPS-31797 fix issue when enabling staging