diff --git a/services/distributeddataservice/service/cloud/cloud_service_impl.cpp b/services/distributeddataservice/service/cloud/cloud_service_impl.cpp
index 4404b855a04f323d13f47c38b0dac1e495275b94..75c4ae3266a401445ff582be5ccb7cb7554a59f1 100644
--- a/services/distributeddataservice/service/cloud/cloud_service_impl.cpp
+++ b/services/distributeddataservice/service/cloud/cloud_service_impl.cpp
@@ -966,9 +966,9 @@ void CloudServiceImpl::UpdateE2eeEnable(const std::string &schemaKey, bool newE2
         return;
     }
     ZLOGI("Update e2eeEnable: %{public}d->%{public}d", oldMeta.e2eeEnable, newE2eeEnable);
-    oldMeta.e2eeEnable = newE2eeEnable;
     Report(FT_ENCRYPT_CHANGED, Fault::CSF_APP_SCHEMA, bundleName,
         "oldE2eeEnable=" + std::to_string(oldMeta.e2eeEnable) + ",newE2eeEnable=" + std::to_string(newE2eeEnable));
+    oldMeta.e2eeEnable = newE2eeEnable;
     MetaDataManager::GetInstance().SaveMeta(schemaKey, oldMeta, true);
 }
 
diff --git a/services/distributeddataservice/service/test/cloud_data_test.cpp b/services/distributeddataservice/service/test/cloud_data_test.cpp
index ce7e8d8c88c7162bca1e80dcc27dd5a8b93266fe..40d39394640128d486d1f61fc2476fa29ca4ab90 100644
--- a/services/distributeddataservice/service/test/cloud_data_test.cpp
+++ b/services/distributeddataservice/service/test/cloud_data_test.cpp
@@ -2216,8 +2216,12 @@ HWTEST_F(CloudDataTest, UpdateE2eeEnableTest, TestSize.Level1)
     EXPECT_EQ(schemaMeta.e2eeEnable, schemaMeta_.e2eeEnable);
 
     ASSERT_NE(cloudServiceImpl_, nullptr);
-    EXPECT_NO_FATAL_FAILURE(cloudServiceImpl_->UpdateE2eeEnable(schemaKey, false, TEST_CLOUD_BUNDLE));
-    EXPECT_NO_FATAL_FAILURE(cloudServiceImpl_->UpdateE2eeEnable(schemaKey, true, TEST_CLOUD_BUNDLE));
+    cloudServiceImpl_->UpdateE2eeEnable(schemaKey, false, TEST_CLOUD_BUNDLE);
+    ASSERT_TRUE(MetaDataManager::GetInstance().LoadMeta(schemaKey, schemaMeta, true));
+    EXPECT_EQ(schemaMeta.e2eeEnable, schemaMeta_.e2eeEnable);
+    cloudServiceImpl_->UpdateE2eeEnable(schemaKey, true, TEST_CLOUD_BUNDLE);
+    ASSERT_TRUE(MetaDataManager::GetInstance().LoadMeta(schemaKey, schemaMeta, true));
+    EXPECT_EQ(schemaMeta.e2eeEnable, true);
 }
 
 /**
diff --git a/services/distributeddataservice/service/test/cloud_service_impl_test.cpp b/services/distributeddataservice/service/test/cloud_service_impl_test.cpp
index 253832a641e4b4ac4fdaf77cb066323e5dc530ab..dbe572a55aab8c2a40429bbf4b223fd8c511d082 100644
--- a/services/distributeddataservice/service/test/cloud_service_impl_test.cpp
+++ b/services/distributeddataservice/service/test/cloud_service_impl_test.cpp
@@ -371,9 +371,12 @@ HWTEST_F(CloudServiceImplTest, CloudDriverCheckTest, TestSize.Level0)
     ZLOGI("CloudServiceImplTest CloudDriverCheckTest start");
     ASSERT_NE(cloudServiceImpl_, nullptr);
     ASSERT_NE(cloudServiceImpl_->factory_.staticActs_, nullptr);
+    CloudServer cloudServer;
+    CloudServer::RegisterCloudInstance(&cloudServer);
     int32_t user = 0;
     auto result = cloudServiceImpl_->factory_.staticActs_->CloudDriverCheck(TEST_CLOUD_BUNDLE, user);
     EXPECT_EQ(result, false);
+    CloudServer::instance_ = nullptr;
 }
 
 /**
@@ -426,8 +429,15 @@ HWTEST_F(CloudServiceImplTest, UpdateSchemaFromServerTest_002, TestSize.Level0)
 HWTEST_F(CloudServiceImplTest, UpdateE2eeEnableTest, TestSize.Level0)
 {
     ZLOGI("CloudServiceImplTest UpdateE2eeEnableTest start");
+    ASSERT_NE(cloudServiceImpl_, nullptr);
+    CloudServer cloudServer;
+    auto result = cloudServer.CloudDriverUpdated(TEST_CLOUD_BUNDLE);
+    EXPECT_EQ(result, false);
+
     std::string schemaKey = "schemaKey";
-    EXPECT_NO_FATAL_FAILURE(cloudServiceImpl_->UpdateE2eeEnable(schemaKey, true, TEST_CLOUD_BUNDLE));
+    cloudServiceImpl_->UpdateE2eeEnable(schemaKey, true, TEST_CLOUD_BUNDLE);
+    SchemaMeta schemaMeta;
+    ASSERT_FALSE(MetaDataManager::GetInstance().LoadMeta(schemaKey, schemaMeta, true));
 }
 
 /**