diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 0b26f98f..43327ccc 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -78,10 +78,10 @@ async fn ping_server(ip: &str, port: i32) -> Result<u32, String> {
             let before = Instant::now();
             match q.recv().await {
                 Ok(_p) => Ok(before.elapsed().as_millis() as u32),
-                Err(_) => Ok(0),
+                Err(_) => Ok(9999),
             }
         }
-        Err(_) => Ok(0),
+        Err(_) => Ok(9999),
     }
 }
 
diff --git a/src/utils/query.ts b/src/utils/query.ts
index c98d5911..9d2332d7 100644
--- a/src/utils/query.ts
+++ b/src/utils/query.ts
@@ -163,8 +163,15 @@ const getServerPing = async (ip: string, port: number, listType: ListType) => {
     let server = getServerFromList(ip, port, listType);
     if (server) {
       let ping = server.ping;
-      if (typeof serverPing === "number" && serverPing !== 9999) {
-        ping = serverPing;
+
+      if (typeof serverPing === "number") {
+        if (serverPing !== 9999) {
+          ping = serverPing;
+        } else {
+          if (server.ping === 0) {
+            ping = serverPing;
+          }
+        }
       }
 
       server = {