diff --git a/src/common.rs b/src/common.rs
index f6c9ce0df..f78cb9e9b 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -960,6 +960,9 @@ pub fn get_custom_rendezvous_server(custom: String) -> String {
 
 #[inline]
 pub fn get_api_server(api: String, custom: String) -> String {
+    if Config::no_register_device() {
+        return "".to_owned();
+    }
     let mut res = get_api_server_(api, custom);
     if res.ends_with('/') {
         res.pop();
diff --git a/src/hbbs_http/sync.rs b/src/hbbs_http/sync.rs
index a94ff7aa2..b82464b24 100644
--- a/src/hbbs_http/sync.rs
+++ b/src/hbbs_http/sync.rs
@@ -127,8 +127,7 @@ async fn start_hbbs_sync_async() {
                 // Though the username comparison is only necessary on Windows,
                 // we still keep the comparison on other platforms for consistency.
                 let need_upload = (!info_uploaded.uploaded || info_uploaded.username.as_ref() != Some(&sys_username)) &&
-                    info_uploaded.last_uploaded.map(|x| x.elapsed() >= UPLOAD_SYSINFO_TIMEOUT).unwrap_or(true)
-                    && !Config::no_register_device();
+                    info_uploaded.last_uploaded.map(|x| x.elapsed() >= UPLOAD_SYSINFO_TIMEOUT).unwrap_or(true);
                 if need_upload {
                     v["version"] = json!(crate::VERSION);
                     v["id"] = json!(id);