diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java
index a43f4c1d24..065381e193 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java
@@ -67,6 +67,9 @@ public class TenantConfigurationCE {
         instanceName = ObjectUtils.defaultIfNull(tenantConfiguration.getInstanceName(), instanceName);
         emailVerificationEnabled =
                 ObjectUtils.defaultIfNull(tenantConfiguration.getEmailVerificationEnabled(), emailVerificationEnabled);
+
+        featuresWithPendingMigration = tenantConfiguration.getFeaturesWithPendingMigration();
+        migrationStatus = tenantConfiguration.getMigrationStatus();
     }
 
     public Boolean getEmailVerificationEnabled() {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseRepository.java
index 2757f2bc81..646067fad9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseRepository.java
@@ -13,6 +13,14 @@ import java.util.Map;
 @NoRepositoryBean
 public interface BaseRepository<T, ID extends Serializable> extends ReactiveMongoRepository<T, ID> {
 
+    /**
+     * This function should be used to get an object from the DB without applying any ACL rules
+     *
+     * @param id The identifier for this type
+     * @return Mono<T>
+     */
+    Mono<T> retrieveById(ID id);
+
     /**
      * This function sets the deleted flag to true and then saves the modified document.
      *
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseRepositoryImpl.java
index a4090d8f70..4f4cefc1d6 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseRepositoryImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseRepositoryImpl.java
@@ -121,6 +121,18 @@ public class BaseRepositoryImpl<T extends BaseDomain, ID extends Serializable>
                 });
     }
 
+    @Override
+    public Mono<T> retrieveById(ID id) {
+        Query query = new Query(getIdCriteria(id));
+        query.addCriteria(notDeleted());
+
+        return mongoOperations
+                .query(entityInformation.getJavaType())
+                .inCollection(entityInformation.getCollectionName())
+                .matching(query)
+                .one();
+    }
+
     @Override
     public Mono<T> findById(ID id) {
         return this.findByIdAndFieldNames(id, null);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCEImpl.java
index 109f73fe1d..eea73eded1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCEImpl.java
@@ -203,8 +203,7 @@ public class TenantServiceCEImpl extends BaseService<TenantRepository, Tenant, S
      */
     @Override
     public Mono<Tenant> checkAndExecuteMigrationsForTenantFeatureFlags(Tenant tenant) {
-        if (tenant.getTenantConfiguration() == null
-                || CollectionUtils.isNullOrEmpty(tenant.getTenantConfiguration().getFeaturesWithPendingMigration())) {
+        if (!isMigrationRequired(tenant)) {
             return Mono.just(tenant);
         }
         Map<FeatureFlagEnum, FeatureMigrationType> featureMigrationTypeMap =
@@ -222,10 +221,25 @@ public class TenantServiceCEImpl extends BaseService<TenantRepository, Tenant, S
                         } else {
                             tenant.getTenantConfiguration().setMigrationStatus(MigrationStatus.IN_PROGRESS);
                         }
-                        return this.save(tenant).flatMap(this::checkAndExecuteMigrationsForTenantFeatureFlags);
+                        return this.save(tenant)
+                                // Fetch the tenant again from DB to make sure the downstream chain is consuming the
+                                // latest
+                                // DB object and not the modified one because of the client pertinent changes
+                                .then(repository.retrieveById(tenant.getId()))
+                                .flatMap(this::checkAndExecuteMigrationsForTenantFeatureFlags);
                     }
                     return Mono.error(
                             new AppsmithException(AppsmithError.FeatureFlagMigrationFailure, featureFlagEnum, ""));
                 });
     }
+
+    private boolean isMigrationRequired(Tenant tenant) {
+        return tenant.getTenantConfiguration() != null
+                && (!CollectionUtils.isNullOrEmpty(
+                                tenant.getTenantConfiguration().getFeaturesWithPendingMigration())
+                        || (CollectionUtils.isNullOrEmpty(
+                                        tenant.getTenantConfiguration().getFeaturesWithPendingMigration())
+                                && !MigrationStatus.COMPLETED.equals(
+                                        tenant.getTenantConfiguration().getMigrationStatus())));
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/TenantServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/TenantServiceCETest.java
index a0e9542402..53a55b572e 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/TenantServiceCETest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/TenantServiceCETest.java
@@ -264,7 +264,6 @@ class TenantServiceCETest {
         final Mono<Tenant> resultMono = tenantService.checkAndExecuteMigrationsForTenantFeatureFlags(tenant);
         StepVerifier.create(resultMono)
                 .assertNext(tenant1 -> {
-                    assertThat(tenant1).isEqualTo(tenant);
                     assertThat(tenant1.getTenantConfiguration().getFeaturesWithPendingMigration())
                             .isEmpty();
                     assertThat(tenant1.getTenantConfiguration().getMigrationStatus())