diff --git a/src/ui_interface.rs b/src/ui_interface.rs
index f45216d0c..5d9dfe083 100644
--- a/src/ui_interface.rs
+++ b/src/ui_interface.rs
@@ -243,10 +243,11 @@ pub fn set_peer_option(id: String, name: String, value: String) {
 
 #[inline]
 pub fn using_public_server() -> bool {
-    if hbb_common::config::RS_PUB_KEY == "OeVuKk5nlHiXp+APNn0Y3pC1Iwpwn44JGqrQCsWqmBw=" {
-        return true
+    let key_check: Option<&'static str> = option_env!("RS_PUB_KEY_VAL");
+    if key_check != "None" and crate::get_custom_rendezvous_server(get_option_("custom-rendezvous-server")).is_empty() {
+        return False;
     } else {
-        return false
+        return True;
     }
 }