diff --git a/src/webapp/features/cards/components/urlCardContent/UrlCardContent.tsx b/src/webapp/features/cards/components/urlCardContent/UrlCardContent.tsx
index 3c0d20e9..d57587cb 100644
--- a/src/webapp/features/cards/components/urlCardContent/UrlCardContent.tsx
+++ b/src/webapp/features/cards/components/urlCardContent/UrlCardContent.tsx
@@ -8,8 +8,7 @@ import LinkCardContent from './LinkCardContent';
 import BlueskyPost from '@/features/platforms/bluesky/components/blueskyPost/BlueskyPost';
 import { Suspense } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import { Stack, Text, Group, Alert, Anchor, Tooltip } from '@mantine/core';
-import BlueskyPlatformIcon from '@/features/platforms/bluesky/components/blueskyPlatformIcon/BlueskyPlatformIcon';
+
 import BlueskyPostSkeleton from '@/features/platforms/bluesky/components/blueskyPost/Skeleton.BlueskyPost';
 import { useUserSettings } from '@/features/settings/lib/queries/useUserSettings';
 import IframeEmbed from '@/features/platforms/common/components/IframeEmbed/IframeEmbed';
@@ -89,45 +88,13 @@ export default function UrlCardContent(props: Props) {
   ) {
     return (
       <ErrorBoundary
-        fallbackRender={({ error }) => {
-          if (error?.status === 404 || error?.error === 'NotFound') {
-            const platformName =
-              platform.type === SupportedPlatform.BLUESKY_POST
-                ? 'Bluesky'
-                : 'Blacksky';
-            return (
-              <Stack justify="space-between" gap="xs">
-                <Group gap="xs" justify="flex-end" wrap="nowrap" w="100%">
-                  <Tooltip label={`View on ${platformName}`}>
-                    <Anchor
-                      href={props.url}
-                      target="_blank"
-                      onClick={(e) => e.stopPropagation()}
-                    >
-                      <BlueskyPlatformIcon platform={platform.type} />
-                    </Anchor>
-                  </Tooltip>
-                </Group>
-                <Alert
-                  component={'button'}
-                  variant="light"
-                  color="gray"
-                  p={'sm'}
-                  title="Post not found"
-                  style={{ cursor: 'pointer' }}
-                />
-              </Stack>
-            );
-          }
-
-          return (
-            <LinkCardContent
-              cardContent={props.cardContent}
-              uri={props.uri}
-              authorHandle={props.authorHandle}
-            />
-          );
-        }}
+        fallback={
+          <LinkCardContent
+            cardContent={props.cardContent}
+            uri={props.uri}
+            authorHandle={props.authorHandle}
+          />
+        }
       >
         <Suspense fallback={<BlueskyPostSkeleton />}>
           <BlueskyPost
diff --git a/src/webapp/features/platforms/bluesky/components/blueskyPost/BlueskyPost.tsx b/src/webapp/features/platforms/bluesky/components/blueskyPost/BlueskyPost.tsx
index fcf99f4c..c36a6f81 100644
--- a/src/webapp/features/platforms/bluesky/components/blueskyPost/BlueskyPost.tsx
+++ b/src/webapp/features/platforms/bluesky/components/blueskyPost/BlueskyPost.tsx
@@ -2,7 +2,7 @@
 
 import { AppBskyFeedDefs, AppBskyFeedPost } from '@atproto/api';
 import { ReactElement } from 'react';
-import { Group, Stack, Text, Box, Anchor, Tooltip } from '@mantine/core';
+import { Group, Stack, Text, Box, Anchor, Tooltip, Alert } from '@mantine/core';
 import RichTextRenderer from '@/components/contentDisplay/richTextRenderer/RichTextRenderer';
 import useGetBlueskyPost from '../../lib/queries/useGetBlueskyPost';
 import PostEmbed from '../postEmbed/PostEmbed';
@@ -28,11 +28,39 @@ interface Props {
 export default function BlueskyPost(props: Props) {
   const { settings } = useUserSettings();
   const uri = getPostUriFromUrl(props.url);
-  const { data, error } = useGetBlueskyPost({ uri });
+  const { data } = useGetBlueskyPost({ uri });
   const showEmbed = settings.cardView === 'grid';
   const platform = detectUrlPlatform(props.url);
   const platformIcon = <BlueskyPlatformIcon platform={platform.type} />;
 
+  if (!data) {
+    return (
+      <Stack justify="space-between" gap="xs">
+        <Group gap="xs" justify="flex-end" wrap="nowrap" w={'100%'}>
+          <Tooltip
+            label={`View on ${platform.type === SupportedPlatform.BLUESKY_POST ? 'Bluesky' : 'Blacksky'}`}
+          >
+            <Anchor
+              href={props.url}
+              target="_blank"
+              onClick={(e) => e.stopPropagation()}
+            >
+              {platformIcon}
+            </Anchor>
+          </Tooltip>
+        </Group>
+        <Alert
+          component={'button'}
+          variant="light"
+          color="gray"
+          p={'sm'}
+          title="Post not found"
+          style={{ cursor: 'pointer' }}
+        />
+      </Stack>
+    );
+  }
+
   if (
     !data.thread ||
     !AppBskyFeedDefs.isThreadViewPost(data.thread) ||
diff --git a/src/webapp/features/platforms/bluesky/components/blueskySemblePost/BlueskySemblePost.tsx b/src/webapp/features/platforms/bluesky/components/blueskySemblePost/BlueskySemblePost.tsx
index 3fb09abd..f7c4130a 100644
--- a/src/webapp/features/platforms/bluesky/components/blueskySemblePost/BlueskySemblePost.tsx
+++ b/src/webapp/features/platforms/bluesky/components/blueskySemblePost/BlueskySemblePost.tsx
@@ -5,7 +5,16 @@ import { getPostUriFromUrl } from '@/lib/utils/atproto';
 import RichTextRenderer from '@/components/contentDisplay/richTextRenderer/RichTextRenderer';
 import { detectUrlPlatform, SupportedPlatform } from '@/lib/utils/link';
 import { getFormattedDate } from '@/lib/utils/time';
-import { Stack, Tooltip, Anchor, Card, Group, Box, Text } from '@mantine/core';
+import {
+  Stack,
+  Tooltip,
+  Anchor,
+  Card,
+  Group,
+  Box,
+  Text,
+  Alert,
+} from '@mantine/core';
 import BlueskyPlatformIcon from '../blueskyPlatformIcon/BlueskyPlatformIcon';
 import PostEmbed from '../postEmbed/PostEmbed';
 import ContentHider from '../contentHider/ContentHider';
@@ -32,6 +41,36 @@ export default async function BlueskySemblePost(props: Props) {
   const platform = detectUrlPlatform(props.url);
   const platformIcon = <BlueskyPlatformIcon platform={platform.type} />;
 
+  if (!data) {
+    return (
+      <Stack gap={'xs'}>
+        <Suspense fallback={<UrlTypeBadgeSkeleton />}>
+          <UrlTypeBadge url={props.url} />
+        </Suspense>
+        <Card p={'xs'} radius={'lg'} withBorder>
+          <Stack gap={'xs'}>
+            <Group gap="xs" justify="flex-end">
+              <Tooltip
+                label={`View on ${platform.type === SupportedPlatform.BLUESKY_POST ? 'Bluesky' : 'Blacksky'}`}
+              >
+                <Anchor href={props.url} target="_blank">
+                  {platformIcon}
+                </Anchor>
+              </Tooltip>
+            </Group>
+            <Alert
+              component={'button'}
+              variant="light"
+              color="gray"
+              p={'sm'}
+              title="Post not found"
+            />
+          </Stack>
+        </Card>
+      </Stack>
+    );
+  }
+
   if (
     !data.thread ||
     !AppBskyFeedDefs.isThreadViewPost(data.thread) ||
diff --git a/src/webapp/features/platforms/bluesky/lib/dal.ts b/src/webapp/features/platforms/bluesky/lib/dal.ts
index 5beeb4dc..a628548e 100644
--- a/src/webapp/features/platforms/bluesky/lib/dal.ts
+++ b/src/webapp/features/platforms/bluesky/lib/dal.ts
@@ -9,11 +9,19 @@ interface Params {
 export const getBlueskyPost = cache(async (uri: string) => {
   const agent = new AtpAgent({ service: 'https://public.api.bsky.app' });
 
-  const post = await agent.getPostThread({
-    uri: uri,
-    depth: 0,
-    parentHeight: 0,
-  });
+  let post;
+  try {
+    post = await agent.getPostThread({
+      uri: uri,
+      depth: 0,
+      parentHeight: 0,
+    });
+  } catch (err: any) {
+    if (err?.status === 404 || err?.error === 'NotFound') {
+      return null;
+    }
+    throw err;
+  }
 
   if (!post.success) {
     throw new Error('Could not load bluesky post');
diff --git a/src/webapp/next-env.d.ts b/src/webapp/next-env.d.ts
index c4b7818f..9edff1c7 100644
--- a/src/webapp/next-env.d.ts
+++ b/src/webapp/next-env.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/dev/types/routes.d.ts";
+import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.