diff --git a/client/src/containers/Setup/SetupRightSection.js b/client/src/containers/Setup/SetupRightSection.js
index ec873205c..fdb169f46 100644
--- a/client/src/containers/Setup/SetupRightSection.js
+++ b/client/src/containers/Setup/SetupRightSection.js
@@ -44,13 +44,13 @@ export default compose(
   withOrganization(
     ({
       organization,
-      isOrganizationInitialized,
+      isOrganizationReady,
       isOrganizationSeeded,
       isOrganizationSetupCompleted,
       isOrganizationBuildRunning,
     }) => ({
       organization,
-      isOrganizationInitialized,
+      isOrganizationReady,
       isOrganizationSeeded,
       isOrganizationSetupCompleted,
       isOrganizationBuildRunning,
diff --git a/client/src/store/organizations/withSetupWizard.js b/client/src/store/organizations/withSetupWizard.js
index 203a200f7..fba1ec4e7 100644
--- a/client/src/store/organizations/withSetupWizard.js
+++ b/client/src/store/organizations/withSetupWizard.js
@@ -4,7 +4,7 @@ export default (mapState) => {
   const mapStateToProps = (state, props) => {
     const {
       isOrganizationSetupCompleted,
-      isOrganizationInitialized,
+      isOrganizationReady,
       isSubscriptionActive,
       isOrganizationBuildRunning
     } = props;
@@ -13,7 +13,7 @@ export default (mapState) => {
       isCongratsStep: isOrganizationSetupCompleted,
       isSubscriptionStep: !isSubscriptionActive,
       isInitializingStep: isOrganizationBuildRunning,
-      isOrganizationStep: !isOrganizationInitialized && !isOrganizationBuildRunning,
+      isOrganizationStep: !isOrganizationReady && !isOrganizationBuildRunning,
     };
     const scenarios = [
       { condition: condits.isSubscriptionStep, step: 'subscription' },