diff --git a/components/Current/Asides/Puff/index.tsx b/components/Current/Asides/Puff/index.tsx
index eab5eeff4..ac2054e42 100644
--- a/components/Current/Asides/Puff/index.tsx
+++ b/components/Current/Asides/Puff/index.tsx
@@ -8,16 +8,23 @@ import styles from "./puff.module.css"
 
 import type { PuffProps } from "@/types/components/current/asides/puff"
 
-export default function Puff({ imageConnection, is_internal, link, link_text, pageConnection, system, text, title }: PuffProps) {
-  return is_internal ? (
-    <Link className={styles.link} href={link.href}>
-      <PuffContent
-        imageConnection={imageConnection}
-        text={text}
-        title={title}
-      />
-    </Link>
-  ) : (
+export default function Puff({ imageConnection, is_internal, link, link_text, pageConnection, text, title }: PuffProps) {
+  if (is_internal) {
+    const page = pageConnection.edges[0]
+    if (!page?.node?.url) {
+      return null
+    }
+    return (
+      <Link className={styles.link} href={page.node.url}>
+        <PuffContent
+          imageConnection={imageConnection}
+          text={text}
+          title={title}
+        />
+      </Link>
+    )
+  }
+  return (
     <a className={styles.link} href={link.href} target="_blank">
       <PuffContent
         imageConnection={imageConnection}
diff --git a/lib/graphql/Fragments/Blocks/List.graphql b/lib/graphql/Fragments/Blocks/List.graphql
index de1a1adb0..749416bef 100644
--- a/lib/graphql/Fragments/Blocks/List.graphql
+++ b/lib/graphql/Fragments/Blocks/List.graphql
@@ -30,7 +30,6 @@ fragment ListItemInternalLink on CurrentBlocksPageBlocksListBlockListItemsListIt
         node {
           __typename
           ...CurrentBlocksPageLink
-          ...TempPageLink
         }
       }
     }
diff --git a/lib/graphql/Fragments/Blocks/Text.graphql b/lib/graphql/Fragments/Blocks/Text.graphql
index 594053e04..3ee6173a8 100644
--- a/lib/graphql/Fragments/Blocks/Text.graphql
+++ b/lib/graphql/Fragments/Blocks/Text.graphql
@@ -11,7 +11,6 @@ fragment TextBlock on CurrentBlocksPageBlocksText {
             __typename
             ...CurrentBlocksPageLink
             ...Image
-            ...TempPageLink
           }
         }
       }
diff --git a/lib/graphql/Fragments/Breadcrumbs.graphql b/lib/graphql/Fragments/Breadcrumbs.graphql
index e45152b9f..2be6fd10e 100644
--- a/lib/graphql/Fragments/Breadcrumbs.graphql
+++ b/lib/graphql/Fragments/Breadcrumbs.graphql
@@ -11,13 +11,6 @@ fragment Breadcrumbs on CurrentBlocksPage {
             title
             url
           }
-          ... on TempPage {
-            breadcrumbs {
-              title
-            }
-            title
-            url
-          }
         }
       }
     }
diff --git a/lib/graphql/Fragments/Footer/Navigation.graphql b/lib/graphql/Fragments/Footer/Navigation.graphql
index 6a08b5d5a..9274a7048 100644
--- a/lib/graphql/Fragments/Footer/Navigation.graphql
+++ b/lib/graphql/Fragments/Footer/Navigation.graphql
@@ -11,7 +11,6 @@ fragment Navigation on Footer {
             edges {
               node {
                 __typename
-                ...TempPageLink
                 ...CurrentBlocksPageLink
               }
             }
diff --git a/lib/graphql/Fragments/PageLinks.graphql b/lib/graphql/Fragments/PageLinks.graphql
index 84d1bd89e..abc9c3920 100644
--- a/lib/graphql/Fragments/PageLinks.graphql
+++ b/lib/graphql/Fragments/PageLinks.graphql
@@ -6,12 +6,3 @@ fragment CurrentBlocksPageLink on CurrentBlocksPage {
   title
   url
 }
-
-fragment TempPageLink on TempPage {
-  system {
-    uid
-    locale
-  }
-  title
-  url
-}
\ No newline at end of file
diff --git a/lib/graphql/Fragments/Preamble.graphql b/lib/graphql/Fragments/Preamble.graphql
index 674314370..dd6424608 100644
--- a/lib/graphql/Fragments/Preamble.graphql
+++ b/lib/graphql/Fragments/Preamble.graphql
@@ -11,7 +11,6 @@ fragment Preamble on CurrentBlocksPage {
             __typename
             ...CurrentBlocksPageLink
             ...Image
-            ...TempPageLink
           }
         }
       }
diff --git a/lib/graphql/Fragments/Puff.graphql b/lib/graphql/Fragments/Puff.graphql
index cab4d8fea..73a55e429 100644
--- a/lib/graphql/Fragments/Puff.graphql
+++ b/lib/graphql/Fragments/Puff.graphql
@@ -20,7 +20,6 @@ fragment Puff on Puff {
       node {
         __typename
         ...CurrentBlocksPageLink
-        ...TempPageLink
       }
     }
   }
diff --git a/types/requests/blocks/list.ts b/types/requests/blocks/list.ts
index bd8c1de1b..8332f6faf 100644
--- a/types/requests/blocks/list.ts
+++ b/types/requests/blocks/list.ts
@@ -1,7 +1,6 @@
 import type { Edges } from "../utils/edges"
-import type { TempPageLink } from "../utils/tempPageLink"
 import type { PageLink } from "../utils/pageLink"
-import { Typename } from "../utils/typename"
+import type { Typename } from "../utils/typename"
 
 enum ListItemStyleEnum {
   checkmark = "checkmark",
@@ -36,7 +35,7 @@ type InternalLinkListItem = Typename<
       link_text?: string
       list_item_style: ListItemStyle
       subtitle?: string
-      pageConnection: Edges<TempPageLink | PageLink>
+      pageConnection: Edges<PageLink>
     }
   },
   BlockListItemsEnum.CurrentBlocksPageBlocksListBlockListItemsListItemInternalLink
diff --git a/types/requests/currentBlockPage.ts b/types/requests/currentBlockPage.ts
index 1461baf4e..251d29753 100644
--- a/types/requests/currentBlockPage.ts
+++ b/types/requests/currentBlockPage.ts
@@ -33,11 +33,7 @@ export interface CurrentBlocksPageBreadcrumb extends SharedBreadcrumb {
   __typename: EmbedEnum.CurrentBlocksPage
 }
 
-export interface TempPageBreadcrumb extends SharedBreadcrumb {
-  __typename: EmbedEnum.TempPage
-}
-
-export type Breadcrumb = CurrentBlocksPageBreadcrumb | TempPageBreadcrumb
+export type Breadcrumb = CurrentBlocksPageBreadcrumb
 
 export type Breadcrumbs = {
   parentsConnection: Edges<Breadcrumb>
diff --git a/types/requests/embeds.ts b/types/requests/embeds.ts
index 140dab873..77d4dc5d3 100644
--- a/types/requests/embeds.ts
+++ b/types/requests/embeds.ts
@@ -1,5 +1,4 @@
 import type { SysAsset } from "./utils/asset"
-import type { TempPageLinkType } from "./utils/tempPageLink"
 import type { PageLinkType } from "./utils/pageLink"
 
-export type Embeds = TempPageLinkType | PageLinkType | SysAsset
+export type Embeds = PageLinkType | SysAsset
diff --git a/types/requests/puff.ts b/types/requests/puff.ts
index 85cc77c6a..b1d6fc553 100644
--- a/types/requests/puff.ts
+++ b/types/requests/puff.ts
@@ -1,7 +1,6 @@
 import type { Image } from "../image"
 import type { Edges } from "./utils/edges"
 import type { Embeds } from "./embeds"
-import type { TempPageLink } from "./utils/tempPageLink"
 import type { PageLink } from "./utils/pageLink"
 import type { RTEDocument } from "../rte/node"
 
@@ -13,7 +12,7 @@ export type Puff = {
     title: string
   }
   link_text?: string
-  pageConnection: Edges<TempPageLink | PageLink>
+  pageConnection: Edges<PageLink>
   system: {
     uid: string
   }
diff --git a/types/requests/utils/embeds.ts b/types/requests/utils/embeds.ts
index c6233eecf..8cdb3fcaa 100644
--- a/types/requests/utils/embeds.ts
+++ b/types/requests/utils/embeds.ts
@@ -1,7 +1,6 @@
 export enum EmbedEnum {
   CurrentBlocksPage = "CurrentBlocksPage",
   SysAsset = "SysAsset",
-  TempPage = "TempPage",
 }
 
 export type Embed = keyof typeof EmbedEnum
diff --git a/types/requests/utils/tempPageLink.ts b/types/requests/utils/tempPageLink.ts
deleted file mode 100644
index 0230fa8be..000000000
--- a/types/requests/utils/tempPageLink.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Lang } from "@/types/lang"
-import type { EmbedEnum } from "./embeds"
-import type { Typename } from "./typename"
-
-export type TempPageLink = {
-  system: {
-    uid: string
-    locale: Lang
-  }
-  title: string
-  url: string
-}
-
-export type TempPageLinkType = Typename<TempPageLink, EmbedEnum.TempPage>