diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index a653242..df1ca54 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -32,7 +32,6 @@ import { useMetadata } from "@/hooks/useMetadata";
 import { useLyrics } from "@/hooks/useLyrics";
 import { useCover } from "@/hooks/useCover";
 import { useAvailability } from "@/hooks/useAvailability";
-import { ensureApiStatusCheckStarted } from "@/lib/api-status";
 import { useDownloadQueueDialog } from "@/hooks/useDownloadQueueDialog";
 import { useDownloadProgress } from "@/hooks/useDownloadProgress";
 import { buildPlaylistFolderName } from "@/lib/playlist";
@@ -198,7 +197,6 @@ function App() {
         };
         mediaQuery.addEventListener("change", handleChange);
         checkForUpdates();
-        ensureApiStatusCheckStarted();
         void loadHistory();
         return () => {
             mediaQuery.removeEventListener("change", handleChange);
diff --git a/frontend/src/components/ApiStatusTab.tsx b/frontend/src/components/ApiStatusTab.tsx
index 674ccd4..3ee097d 100644
--- a/frontend/src/components/ApiStatusTab.tsx
+++ b/frontend/src/components/ApiStatusTab.tsx
@@ -1,14 +1,14 @@
 import { Button } from "@/components/ui/button";
-import { RefreshCw, CheckCircle2, XCircle, Loader2 } from "lucide-react";
+import { SearchCheck, CheckCircle2, XCircle, Loader2 } from "lucide-react";
 import { TidalIcon, QobuzIcon, AmazonIcon, LrclibIcon, MusicBrainzIcon } from "./PlatformIcons";
 import { useApiStatus } from "@/hooks/useApiStatus";
 export function ApiStatusTab() {
-    const { sources, statuses, isCheckingAll, refreshAll } = useApiStatus();
+    const { sources, statuses, isCheckingAll, checkAll } = useApiStatus();
     return (<div className="space-y-6">
       <div className="flex items-center justify-end">
-        <Button variant="outline" onClick={() => void refreshAll()} disabled={isCheckingAll} className="gap-2">
-          <RefreshCw className={`h-4 w-4 ${isCheckingAll ? "animate-spin" : ""}`}/>
-          Refresh All
+        <Button variant="outline" onClick={() => void checkAll()} disabled={isCheckingAll} className="gap-2">
+          {isCheckingAll ? <Loader2 className="h-4 w-4 animate-spin"/> : <SearchCheck className="h-4 w-4"/>}
+          Check
         </Button>
       </div>
 
diff --git a/frontend/src/hooks/useApiStatus.ts b/frontend/src/hooks/useApiStatus.ts
index 24a8b8b..bff3601 100644
--- a/frontend/src/hooks/useApiStatus.ts
+++ b/frontend/src/hooks/useApiStatus.ts
@@ -1,9 +1,8 @@
 import { useEffect, useState } from "react";
-import { API_SOURCES, checkAllApiStatuses, ensureApiStatusCheckStarted, getApiStatusState, subscribeApiStatus, } from "@/lib/api-status";
+import { API_SOURCES, checkAllApiStatuses, getApiStatusState, subscribeApiStatus, } from "@/lib/api-status";
 export function useApiStatus() {
     const [state, setState] = useState(getApiStatusState);
     useEffect(() => {
-        ensureApiStatusCheckStarted();
         return subscribeApiStatus(() => {
             setState(getApiStatusState());
         });
@@ -11,6 +10,6 @@ export function useApiStatus() {
     return {
         ...state,
         sources: API_SOURCES,
-        refreshAll: () => checkAllApiStatuses(true),
+        checkAll: () => checkAllApiStatuses(false),
     };
 }
diff --git a/frontend/src/lib/api-status.ts b/frontend/src/lib/api-status.ts
index 87689b7..37875ff 100644
--- a/frontend/src/lib/api-status.ts
+++ b/frontend/src/lib/api-status.ts
@@ -91,17 +91,6 @@ export function subscribeApiStatus(listener: () => void): () => void {
         listeners.delete(listener);
     };
 }
-export function hasApiStatusResults(): boolean {
-    return API_SOURCES.some((source) => {
-        const status = apiStatusState.statuses[source.id];
-        return status === "online" || status === "offline";
-    });
-}
-export function ensureApiStatusCheckStarted(): void {
-    if (!activeCheckAll && !hasApiStatusResults()) {
-        void checkAllApiStatuses(false);
-    }
-}
 export async function checkAllApiStatuses(forceRefresh: boolean = false): Promise<void> {
     if (activeCheckAll) {
         return activeCheckAll;