diff --git a/apps/start/src/components/overview/overview-share.tsx b/apps/start/src/components/overview/overview-share.tsx
index 9d570faf..55b16047 100644
--- a/apps/start/src/components/overview/overview-share.tsx
+++ b/apps/start/src/components/overview/overview-share.tsx
@@ -19,9 +19,14 @@ interface OverviewShareProps {
 export function OverviewShare({ projectId }: OverviewShareProps) {
   const trpc = useTRPC();
   const query = useQuery(
-    trpc.share.overview.queryOptions({
-      projectId,
-    }),
+    trpc.share.overview.queryOptions(
+      {
+        projectId,
+      },
+      {
+        retry: 0,
+      },
+    ),
   );
   const data = query.data;
   const mutation = useMutation(
diff --git a/packages/trpc/src/routers/share.ts b/packages/trpc/src/routers/share.ts
index 7a45fb37..15f9d8b0 100644
--- a/packages/trpc/src/routers/share.ts
+++ b/packages/trpc/src/routers/share.ts
@@ -48,7 +48,12 @@ export const shareRouter = createTRPCRouter({
       });
 
       if (!share) {
-        throw TRPCNotFoundError('Share not found');
+        // Throw error if shareId is provided, otherwise return null
+        if ('shareId' in input) {
+          throw TRPCNotFoundError('Share not found');
+        }
+
+        return null;
       }
 
       return {