diff --git a/app/projects/[pubkey]/[id]/StandaloneProjectPage.tsx b/app/projects/[pubkey]/[id]/StandaloneProjectPage.tsx
index 25607b6..353e65e 100644
--- a/app/projects/[pubkey]/[id]/StandaloneProjectPage.tsx
+++ b/app/projects/[pubkey]/[id]/StandaloneProjectPage.tsx
@@ -14,6 +14,8 @@ import {
   Zap,
 } from "lucide-react";
 import {
+  fetchCommunityProjects,
+  fetchCommunityProjectsSnapshot,
   fetchProjectByDTag,
   fetchAuthorPictures,
   TOP10_RELAYS,
@@ -26,6 +28,7 @@ import { dedupeSoldierProfileMembers } from "@/lib/soldierProfileLinks";
 import NewProjectModal, {
   type ProjectEditField,
 } from "@/components/NewProjectModal";
+import { projectMatchesIdentifier } from "@/lib/projectIdentity";
 
 const STATUS_BADGE: Record<string, string> = {
   official: "bg-bitcoin/10 border-bitcoin/40 text-bitcoin",
@@ -75,14 +78,62 @@ export default function StandaloneProjectPage({
   const { auth } = useAuth();
 
   useEffect(() => {
-    fetchProjectByDTag(pubkey, projectId, TOP10_RELAYS).then((p) => {
-      setProject(p);
-      if (p) {
-        fetchAuthorPictures([pubkey], TOP10_RELAYS).then((pics) =>
-          setAuthorPicture(pics.get(pubkey)),
-        );
+    const abort = new AbortController();
+    let cancelled = false;
+
+    async function loadProject() {
+      const showProject = (p: UserProject, author = pubkey) => {
+        setProject(p);
+        fetchAuthorPictures([author], TOP10_RELAYS).then((pics) => {
+          if (!cancelled) setAuthorPicture(pics.get(author));
+        });
+      };
+
+      const direct = await fetchProjectByDTag(pubkey, projectId, TOP10_RELAYS);
+      if (cancelled) return;
+      if (direct) {
+        showProject(direct);
+        return;
+      }
+
+      const snapshot = await fetchCommunityProjectsSnapshot({
+        signal: abort.signal,
+      }).catch(() => null);
+      if (cancelled) return;
+      const fromSnapshot =
+        snapshot?.projects.find(
+          (p) =>
+            p.author === pubkey &&
+            projectMatchesIdentifier(p, projectId),
+        ) ?? null;
+      if (fromSnapshot) {
+        showProject(fromSnapshot, fromSnapshot.author);
+        return;
       }
+
+      const broad = await fetchCommunityProjects(TOP10_RELAYS, {
+        perRelayTimeoutMs: 5000,
+        signal: abort.signal,
+      }).catch(() => []);
+      if (cancelled) return;
+      const fromRelays =
+        broad.find(
+          (p) =>
+            p.author === pubkey &&
+            projectMatchesIdentifier(p, projectId),
+        ) ?? null;
+      if (fromRelays) showProject(fromRelays, fromRelays.author);
+      else setProject(null);
+    }
+
+    loadProject().catch(() => {
+      if (!cancelled) setProject(null);
     });
+
+    return () => {
+      cancelled = true;
+      abort.abort();
+    };
   }, [pubkey, projectId]);
 
   const backHref = project?.hackathon ? `/hackathons/${project.hackathon}` : "/projects";
diff --git a/app/projects/[pubkey]/[id]/page.tsx b/app/projects/[pubkey]/[id]/page.tsx
index a308816..01b5c33 100644
--- a/app/projects/[pubkey]/[id]/page.tsx
+++ b/app/projects/[pubkey]/[id]/page.tsx
@@ -1,4 +1,5 @@
 import type { Metadata } from "next";
+import { Suspense } from "react";
 import StandaloneProjectPage from "./StandaloneProjectPage";
 
 export const metadata: Metadata = {
@@ -6,11 +7,30 @@ export const metadata: Metadata = {
   robots: { index: false, follow: false },
 };
 
-export default async function ProjectPage({
+function ProjectFallback() {
+  return (
+    <div className="relative pt-24 pb-16">
+      <div className="max-w-5xl mx-auto px-4 sm:px-6 lg:px-8">
+        <div className="animate-pulse space-y-4 mt-8">
+          <div className="h-8 bg-white/5 rounded-lg w-64" />
+          <div className="h-4 bg-white/5 rounded w-full max-w-lg" />
+          <div className="h-4 bg-white/5 rounded w-3/4 max-w-md" />
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export default function ProjectPage({
   params,
 }: {
   params: Promise<{ pubkey: string; id: string }>;
 }) {
-  const { pubkey, id: projectId } = await params;
-  return <StandaloneProjectPage pubkey={pubkey} projectId={projectId} />;
+  return (
+    <Suspense fallback={<ProjectFallback />}>
+      {params.then(({ pubkey, id: projectId }) => (
+        <StandaloneProjectPage pubkey={pubkey} projectId={projectId} />
+      ))}
+    </Suspense>
+  );
 }