diff --git a/src/components/proxy/proxy-global.tsx b/src/components/proxy/proxy-global.tsx
index 7529dcb5fd98ed8e31a7dcb89732cceb05d2df7a..d3d36f93e4be2330ea68e6a8528bb6ecf8410de3 100644
--- a/src/components/proxy/proxy-global.tsx
+++ b/src/components/proxy/proxy-global.tsx
@@ -70,12 +70,9 @@ const ProxyGlobal = (props: Props) => {
   const onCheckAll = useLockFn(async () => {
     const names = sortedProxies.map((p) => p.name);
 
-    await delayManager.checkListDelay(
-      { names, groupName, skipNum: 8, maxTimeout: 600 },
-      () => mutate("getProxies")
+    await delayManager.checkListDelay({ names, groupName, skipNum: 8 }, () =>
+      mutate("getProxies")
     );
-
-    mutate("getProxies");
   });
 
   useEffect(() => onLocation(false), [groupName]);
diff --git a/src/components/proxy/proxy-group.tsx b/src/components/proxy/proxy-group.tsx
index 61b8298104198041a18ce2db462a52427cad4cc3..3f6a6db3cdf44e6d1068b503b4bb3ba1a6499ada 100644
--- a/src/components/proxy/proxy-group.tsx
+++ b/src/components/proxy/proxy-group.tsx
@@ -92,12 +92,11 @@ const ProxyGroup = ({ group }: Props) => {
     const names = sortedProxies.map((p) => p.name);
     const groupName = group.name;
 
-    await delayManager.checkListDelay(
-      { names, groupName, skipNum: 8, maxTimeout: 600 },
-      () => mutate("getProxies")
+    await delayManager.checkListDelay({ names, groupName, skipNum: 8 }, () =>
+      mutate("getProxies")
     );
 
-    mutate("getProxies");
+    console.log("finish");
   });
 
   // auto scroll to current index
diff --git a/src/components/proxy/proxy-item.tsx b/src/components/proxy/proxy-item.tsx
index 071aea2fd2bbd26b99a10ca26407c9f1965e09fb..73bed6758bcd29a9bbf80c186ec9ef1f48d3bd94 100644
--- a/src/components/proxy/proxy-item.tsx
+++ b/src/components/proxy/proxy-item.tsx
@@ -1,4 +1,5 @@
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useState } from "react";
+import { useLockFn } from "ahooks";
 import { CheckCircleOutlineRounded } from "@mui/icons-material";
 import {
   alpha,
@@ -50,20 +51,15 @@ const ProxyItem = (props: Props) => {
     }
   }, [proxy]);
 
-  const delayRef = useRef(false);
-  const onDelay = (e: any) => {
+  const onDelay = useLockFn(async (e: any) => {
     e.preventDefault();
     e.stopPropagation();
 
-    if (delayRef.current) return;
-    delayRef.current = true;
-
-    delayManager
+    return delayManager
       .checkDelay(proxy.name, groupName)
       .then((result) => setDelay(result))
-      .catch(() => setDelay(1e6))
-      .finally(() => (delayRef.current = false));
-  };
+      .catch(() => setDelay(1e6));
+  });
 
   return (
     <ListItem sx={sx}>
diff --git a/src/services/delay.ts b/src/services/delay.ts
index 9cdf90c493422a187e0dc83580cc5b69c37594fd..f898a796d88bc50e910351c51e9e4979e10479a9 100644
--- a/src/services/delay.ts
+++ b/src/services/delay.ts
@@ -48,32 +48,36 @@ class DelayManager {
       names: readonly string[];
       groupName: string;
       skipNum: number;
-      maxTimeout: number;
     },
     callback: Function
   ) {
-    let names = [...options.names];
-    const { groupName, skipNum, maxTimeout } = options;
-
-    while (names.length) {
-      const list = names.slice(0, skipNum);
-      names = names.slice(skipNum);
-
-      let called = false;
-      setTimeout(() => {
-        if (!called) {
-          called = true;
-          callback();
-        }
-      }, maxTimeout);
-
-      await Promise.all(list.map((n) => this.checkDelay(n, groupName)));
-
-      if (!called) {
-        called = true;
-        callback();
-      }
-    }
+    const { groupName, skipNum } = options;
+
+    const names = [...options.names];
+    const total = names.length;
+
+    let count = 0;
+    let current = 0;
+
+    return new Promise((resolve) => {
+      const help = async (): Promise<void> => {
+        if (current >= skipNum) return;
+
+        const task = names.shift();
+        if (!task) return;
+
+        current += 1;
+        await this.checkDelay(task, groupName);
+        current -= 1;
+
+        if (count++ % skipNum === 0 || count === total) callback();
+        if (count === total) resolve(null);
+
+        return help();
+      };
+
+      for (let i = 0; i < skipNum; ++i) help();
+    });
   }
 }