diff --git a/kernel/model/conf.go b/kernel/model/conf.go
index e0c57b9f6..b27c07d53 100644
--- a/kernel/model/conf.go
+++ b/kernel/model/conf.go
@@ -399,10 +399,12 @@ func Close(force bool, execInstallPkg int) (exitCode int) {
 	WaitForWritingFiles()
 
 	if !force {
-		syncData(false, true, false)
-		if 0 != ExitSyncSucc {
-			exitCode = 1
-			return
+		if Conf.Sync.Enabled && ((IsSubscriber() && conf.ProviderSiYuan == Conf.Sync.Provider) || conf.ProviderSiYuan != Conf.Sync.Provider) {
+			syncData(false, true, false)
+			if 0 != ExitSyncSucc {
+				exitCode = 1
+				return
+			}
 		}
 	}
 
diff --git a/kernel/model/sync.go b/kernel/model/sync.go
index bac54db5a..ff2ff2309 100644
--- a/kernel/model/sync.go
+++ b/kernel/model/sync.go
@@ -91,7 +91,6 @@ func BootSyncData() {
 }
 
 func SyncData(boot, exit, byHand bool) {
-	util.BroadcastByType("main", "syncing", 0, Conf.Language(81), nil)
 	syncData(boot, exit, byHand)
 }
 
@@ -161,10 +160,6 @@ func checkSync(boot, exit, byHand bool) bool {
 		return false
 	}
 
-	if !cloud.IsValidCloudDirName(Conf.Sync.CloudName) {
-		return false
-	}
-
 	if util.IsMutexLocked(&syncLock) {
 		logging.LogWarnf("sync is in progress")
 		planSyncAfter(30 * time.Second)