diff --git a/app/[lang]/(live)/(protected)/my-pages/layout.tsx b/app/[lang]/(live)/(protected)/my-pages/layout.tsx
index 086e8e28a..4ab5ba8cc 100644
--- a/app/[lang]/(live)/(protected)/my-pages/layout.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/layout.tsx
@@ -55,7 +55,7 @@ export default async function MyPagesLayout({
       }
     })
   }
-
+  // navigation_my_pages is of type Single, hence the hard [0]
   const navigation = response.data.all_navigation_my_pages.items[0]
   const menuItems = mapMenuItems(navigation.items)
 
diff --git a/lib/graphql/Fragments/PageLinks.graphql b/lib/graphql/Fragments/PageLinks.graphql
index 1b82b2a59..25533652c 100644
--- a/lib/graphql/Fragments/PageLinks.graphql
+++ b/lib/graphql/Fragments/PageLinks.graphql
@@ -6,3 +6,37 @@ fragment CurrentBlocksPageLink on CurrentBlocksPage {
   title
   url
 }
+
+fragment CodeDefinedPageLink on CodeDefinedPage {
+  system {
+    uid
+  }
+  title
+  url
+}
+
+fragment AccountPageLink on AccountPage {
+  system {
+    uid
+  }
+  title
+  url
+}
+
+fragment LoyaltyPageLink on LoyaltyPage {
+  system {
+    uid
+  }
+  title
+  url
+}
+
+fragment ContentPageLink on ContentPage {
+  system {
+    uid
+  }
+  web {
+    url
+  }
+  title
+}
diff --git a/lib/graphql/Query/NavigationMyPages.graphql b/lib/graphql/Query/NavigationMyPages.graphql
index 09bcadc21..66af4770e 100644
--- a/lib/graphql/Query/NavigationMyPages.graphql
+++ b/lib/graphql/Query/NavigationMyPages.graphql
@@ -1,36 +1,4 @@
-fragment CodeDefinedPage on CodeDefinedPage {
-  title
-  url
-  system {
-    uid
-  }
-}
-
-fragment AccountPage on AccountPage {
-  title
-  url
-  system {
-    uid
-  }
-}
-
-fragment LoyaltyPage on LoyaltyPage {
-  title
-  url
-  system {
-    uid
-  }
-}
-
-fragment ContentPage on ContentPage {
-  title
-  web {
-    url
-  }
-  system {
-    uid
-  }
-}
+#import "../Fragments/PageLinks.graphql"
 
 query GetNavigationMyPages {
   all_navigation_my_pages {
@@ -49,10 +17,10 @@ query GetNavigationMyPages {
                     edges {
                       node {
                         __typename
-                        ...AccountPage
-                        ...LoyaltyPage
-                        ...CodeDefinedPage
-                        ...ContentPage
+                        ...AccountPageLink
+                        ...LoyaltyPageLink
+                        ...CodeDefinedPageLink
+                        ...ContentPageLink
                       }
                     }
                   }
@@ -63,10 +31,10 @@ query GetNavigationMyPages {
               edges {
                 node {
                   __typename
-                  ...AccountPage
-                  ...LoyaltyPage
-                  ...ContentPage
-                  ...CodeDefinedPage
+                  ...AccountPageLink
+                  ...LoyaltyPageLink
+                  ...ContentPageLink
+                  ...CodeDefinedPageLink
                 }
               }
             }