diff --git a/services/distributeddataservice/service/cloud/sync_manager.cpp b/services/distributeddataservice/service/cloud/sync_manager.cpp
index 1391796224bf894a550a943e687400803348fb65..60334eec2da4832cbfdbe5e92a78217b1d5c9161 100644
--- a/services/distributeddataservice/service/cloud/sync_manager.cpp
+++ b/services/distributeddataservice/service/cloud/sync_manager.cpp
@@ -441,17 +441,15 @@ std::function<void(const Event &)> SyncManager::GetSyncHandler(Retryer retryer)
 
 void SyncManager::ReportSyncEvent(const SyncEvent &evt, BizState bizState, int32_t code)
 {
-    SyncStage syncStage = SyncStage::START;
     auto &storeInfo = evt.GetStoreInfo();
     if (bizState == BizState::BEGIN) {
-        syncStage = SyncStage::START;
         RadarReporter::Report({storeInfo.bundleName.c_str(), CLOUD_SYNC, TRIGGER_SYNC,
             storeInfo.syncId, evt.GetTriggerMode()}, "GetSyncHandler", bizState);
     } else {
-        syncStage = SyncStage::END;
         RadarReporter::Report({storeInfo.bundleName.c_str(), CLOUD_SYNC, FINISH_SYNC,
             storeInfo.syncId, evt.GetTriggerMode(), code}, "GetSyncHandler", bizState);
     }
+    SyncStage syncStage = (bizState == BizState::BEGIN) ? SyncStage::START : SyncStage::END;
     Report({evt.GetUser(), storeInfo.bundleName, evt.GetPrepareTraceId(), syncStage, code});
 }
 
@@ -723,7 +721,7 @@ std::pair<int32_t, CloudLastSyncInfo> SyncManager::GetLastResults(std::map<SyncI
 {
     auto iter = infos.rbegin();
     if (iter != infos.rend() && iter->second.code != -1) {
-        return { SUCCESS, std::move(iter->second) };
+        return { SUCCESS, iter->second };
     }
     return { E_ERROR, {} };
 }
@@ -733,10 +731,7 @@ bool SyncManager::NeedSaveSyncInfo(const QueryKey &queryKey)
     if (queryKey.accountId.empty()) {
         return false;
     }
-    if (std::find(kvApps_.begin(), kvApps_.end(), queryKey.bundleName) != kvApps_.end()) {
-        return false;
-    }
-    return true;
+    return kvApps_.find(queryKey.bundleName) == kvApps_.end();
 }
 
 std::pair<int32_t, std::map<std::string, CloudLastSyncInfo>> SyncManager::QueryLastSyncInfo(
diff --git a/services/distributeddataservice/service/rdb/rdb_service_impl.cpp b/services/distributeddataservice/service/rdb/rdb_service_impl.cpp
index 4f9cbd8ebf7e7a5706aac5049627a0f9691dfbb1..ae8e4d3e80988c44665071eba38f37ddf9306849 100644
--- a/services/distributeddataservice/service/rdb/rdb_service_impl.cpp
+++ b/services/distributeddataservice/service/rdb/rdb_service_impl.cpp
@@ -823,6 +823,7 @@ int32_t RdbServiceImpl::AfterOpen(const RdbSyncerParam &param)
     auto meta = GetStoreMetaData(param);
     StoreMetaData old;
     auto isCreated = MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), old, true);
+    meta.enableCloud = isCreated ? old.enableCloud : meta.enableCloud;
     if (!isCreated || meta != old) {
         Upgrade(param, old);
         ZLOGI("meta bundle:%{public}s store:%{public}s type:%{public}d->%{public}d encrypt:%{public}d->%{public}d "
@@ -844,15 +845,10 @@ int32_t RdbServiceImpl::AfterOpen(const RdbSyncerParam &param)
     SavePromiseInfo(meta, param);
     SaveDfxInfo(meta, param);
 
-    AppIDMetaData appIdMeta;
-    appIdMeta.bundleName = meta.bundleName;
-    appIdMeta.appId = meta.appId;
-    if (!MetaDataManager::GetInstance().SaveMeta(appIdMeta.GetKey(), appIdMeta, true)) {
-        ZLOGE("meta bundle:%{public}s store:%{public}s type:%{public}d->%{public}d encrypt:%{public}d->%{public}d "
-            "area:%{public}d->%{public}d", meta.bundleName.c_str(), meta.GetStoreAlias().c_str(), old.storeType,
-            meta.storeType, old.isEncrypt, meta.isEncrypt, old.area, meta.area);
+    if (!SaveAppIDMeta(meta, old)) {
         return RDB_ERROR;
     }
+
     if (param.isEncrypt_ && !param.password_.empty()) {
         if (SetSecretKey(param, meta) != RDB_OK) {
             ZLOGE("Set secret key failed, bundle:%{public}s store:%{public}s",
@@ -865,6 +861,21 @@ int32_t RdbServiceImpl::AfterOpen(const RdbSyncerParam &param)
     return RDB_OK;
 }
 
+bool RdbServiceImpl::SaveAppIDMeta(const StoreMetaData &meta, const StoreMetaData &old)
+{
+    AppIDMetaData appIdMeta;
+    appIdMeta.bundleName = meta.bundleName;
+    appIdMeta.appId = meta.appId;
+    if (!MetaDataManager::GetInstance().SaveMeta(appIdMeta.GetKey(), appIdMeta, true)) {
+        ZLOGE("meta bundle:%{public}s store:%{public}s type:%{public}d->%{public}d encrypt:%{public}d->%{public}d "
+              "area:%{public}d->%{public}d",
+            meta.bundleName.c_str(), meta.GetStoreAlias().c_str(), old.storeType, meta.storeType,
+            old.isEncrypt, meta.isEncrypt, old.area, meta.area);
+        return false;
+    }
+    return true;
+}
+
 int32_t RdbServiceImpl::ReportStatistic(const RdbSyncerParam& param, const RdbStatEvent &statEvent)
 {
     if (!CheckAccess(param.bundleName_, param.storeName_)) {
diff --git a/services/distributeddataservice/service/rdb/rdb_service_impl.h b/services/distributeddataservice/service/rdb/rdb_service_impl.h
index a387261f3c8453459b6e953c7d41cfc695f45bf1..f1e425d6cc941889a02963d5b30f536314d354ba 100755
--- a/services/distributeddataservice/service/rdb/rdb_service_impl.h
+++ b/services/distributeddataservice/service/rdb/rdb_service_impl.h
@@ -216,6 +216,8 @@ private:
 
     static bool GetDBPassword(const StoreMetaData &metaData, DistributedDB::CipherPassword &password);
 
+    static bool SaveAppIDMeta(const StoreMetaData &meta, const StoreMetaData &old);
+
     void GetSchema(const RdbSyncerParam &param);
 
     void SetReturnParam(StoreMetaData &metadata, RdbSyncerParam &param);