diff --git a/apps/raycast-extension/src/api.ts b/apps/raycast-extension/src/api.ts
index f36d82fb..87899bc3 100644
--- a/apps/raycast-extension/src/api.ts
+++ b/apps/raycast-extension/src/api.ts
@@ -214,9 +214,3 @@ export async function searchMemories(
 		throw error
 	}
 }
-
-// Helper function to check if API key is configured and valid
-export async function fetchSettings(): Promise<object> {
-	const response = await makeAuthenticatedRequest<object>("/v3/settings")
-	return response
-}
diff --git a/apps/raycast-extension/src/search-projects.tsx b/apps/raycast-extension/src/search-projects.tsx
index 02b423d5..e0d3fe5e 100644
--- a/apps/raycast-extension/src/search-projects.tsx
+++ b/apps/raycast-extension/src/search-projects.tsx
@@ -11,15 +11,15 @@ import { fetchProjects, addProject } from "./api"
 import {
 	FormValidation,
 	showFailureToast,
-	useCachedPromise,
 	useForm,
+	usePromise,
 } from "@raycast/utils"
 import { withSupermemory } from "./withSupermemory"
 
 export default withSupermemory(Command)
 
 function Command() {
-	const { isLoading, data: projects, mutate } = useCachedPromise(fetchProjects)
+	const { isLoading, data: projects, mutate } = usePromise(fetchProjects)
 
 	return (
 		<List isLoading={isLoading} searchBarPlaceholder="Search your projects">
diff --git a/apps/raycast-extension/src/withSupermemory.tsx b/apps/raycast-extension/src/withSupermemory.tsx
index 9c789751..01043c3f 100644
--- a/apps/raycast-extension/src/withSupermemory.tsx
+++ b/apps/raycast-extension/src/withSupermemory.tsx
@@ -1,9 +1,7 @@
-import { usePromise } from "@raycast/utils"
-import { fetchSettings } from "./api"
 import {
 	Action,
 	ActionPanel,
-	Detail,
+	getPreferenceValues,
 	Icon,
 	List,
 	openExtensionPreferences,
@@ -12,18 +10,11 @@ import type { ComponentType } from "react"
 
 export function withSupermemory<P extends object>(Component: ComponentType<P>) {
 	return function SupermemoryWrappedComponent(props: P) {
-		const { isLoading, data } = usePromise(fetchSettings, [], {
-			failureToastOptions: {
-				title: "Invalid API Key",
-				message:
-					"Invalid API key. Please check your API key in preferences. Get a new one from https://supermemory.link/raycast",
-			},
-		})
+		// Let each command enforce its own endpoint-specific permissions and rate limit.
+		const { apiKey } = getPreferenceValues<Preferences>()
 
-		if (!data) {
-			return isLoading ? (
-				<Detail isLoading />
-			) : (
+		if (!apiKey.trim()) {
+			return (
 				<List>
 					<List.EmptyView
 						icon={Icon.ExclamationMark}