diff --git a/.gitignore b/.gitignore
index 35e991e7..3f48b478 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ drizzle.config.ts
 node_modules
 .pnp
 .pnp.js
+bun.lock
 
 # Local env files
 .env
diff --git a/apps/web/components/views/integrations.tsx b/apps/web/components/views/integrations.tsx
index 00d9ab60..5a6d09d0 100644
--- a/apps/web/components/views/integrations.tsx
+++ b/apps/web/components/views/integrations.tsx
@@ -259,6 +259,10 @@ export function IntegrationsView() {
 
 	const createRaycastApiKeyMutation = useMutation({
 		mutationFn: async () => {
+			if (!org?.id) {
+				throw new Error("Organization ID is required")
+			}
+			
 			const res = await authClient.apiKey.create({
 				metadata: {
 					organizationId: org?.id,
@@ -287,12 +291,13 @@ export function IntegrationsView() {
 		if (
 			qParam === "raycast" &&
 			!hasTriggeredRaycast &&
-			!createRaycastApiKeyMutation.isPending
+			!createRaycastApiKeyMutation.isPending &&
+			org?.id
 		) {
 			setHasTriggeredRaycast(true)
 			createRaycastApiKeyMutation.mutate()
 		}
-	}, [searchParams, hasTriggeredRaycast, createRaycastApiKeyMutation])
+	}, [searchParams, hasTriggeredRaycast, createRaycastApiKeyMutation, org])
 
 	const handleShortcutClick = (shortcutType: "add" | "search") => {
 		setSelectedShortcutType(shortcutType)