Revert "Revert "Fix updater state""

This reverts commit 7ac6fe52d85f60c8e5426c394274290383be40fa.