diff --git a/framework/shopify/api/index.ts b/framework/shopify/api/index.ts
index 0fe58f2df..4e23ce99c 100644
--- a/framework/shopify/api/index.ts
+++ b/framework/shopify/api/index.ts
@@ -8,7 +8,6 @@ import {
 } from '../const'
 
 if (!API_URL) {
-  console.log(process.env)
   throw new Error(
     `The environment variable NEXT_PUBLIC_SHOPIFY_STORE_DOMAIN is missing and it's required to access your store`
   )
diff --git a/framework/shopify/common/get-all-pages.ts b/framework/shopify/common/get-all-pages.ts
index 6f06185e2..94e64ee81 100644
--- a/framework/shopify/common/get-all-pages.ts
+++ b/framework/shopify/common/get-all-pages.ts
@@ -25,12 +25,14 @@ const getAllPages = async (options?: {
 }): Promise<ReturnType> => {
   let { config, variables = { first: 250 } } = options ?? {}
   config = getConfig(config)
+  const { locale = 'en-US' } = config
+
   const { data } = await config.fetch(getAllPagesQuery, { variables })
 
   const pages = data.pages?.edges?.map(
     ({ node: { title: name, handle, ...node } }: PageEdge) => ({
       ...node,
-      url: `/${handle}`,
+      url: `/${locale}/${handle}`,
       name,
     })
   )
diff --git a/framework/shopify/common/get-page.ts b/framework/shopify/common/get-page.ts
index 6016c8c9a..8a186c4e1 100644
--- a/framework/shopify/common/get-page.ts
+++ b/framework/shopify/common/get-page.ts
@@ -2,34 +2,33 @@ import { getConfig, ShopifyConfig } from '../api'
 import getPageQuery from '../utils/queries/get-page-query'
 import { Page } from './get-all-pages'
 
-type Variables = {
-  slug: string
+type PageVariables = {
+  id: string
 }
 
-type ReturnType = {
-  page: Page
-}
+export type GetPageResult<T extends { page?: any } = { page?: Page }> = T
 
 const getPage = async (options: {
-  variables: Variables
+  variables: PageVariables
   config: ShopifyConfig
   preview?: boolean
-}): Promise<ReturnType> => {
+}): Promise<GetPageResult> => {
   let { config, variables } = options ?? {}
+
   config = getConfig(config)
+  const { locale = 'en-US' } = config
 
   const { data } = await config.fetch(getPageQuery, {
     variables,
   })
-
-  const { pageByHandle: page } = data
+  const page = data.node
 
   return {
     page: page
       ? {
           ...page,
           name: page.title,
-          url: page?.handle,
+          url: `/${locale}/${page.handle}`,
         }
       : null,
   }
diff --git a/framework/shopify/product/use-search.tsx b/framework/shopify/product/use-search.tsx
index 4b14249ca..4d992f4f1 100644
--- a/framework/shopify/product/use-search.tsx
+++ b/framework/shopify/product/use-search.tsx
@@ -23,6 +23,7 @@ export type SearchProductsData = {
   products: Product[]
   found: boolean
 }
+
 export const handler: SWRHook<
   SearchProductsData,
   SearchProductsInput,
diff --git a/framework/shopify/utils/queries/get-page-query.ts b/framework/shopify/utils/queries/get-page-query.ts
index dcafdc30d..2ca79abd4 100644
--- a/framework/shopify/utils/queries/get-page-query.ts
+++ b/framework/shopify/utils/queries/get-page-query.ts
@@ -1,12 +1,13 @@
 export const getPageQuery = /* GraphQL */ `
-  query getPageBySlug($slug: String!) {
-    pageByHandle(handle: $slug) {
+  query($id: ID!) {
+    node(id: $id) {
       id
-      title
-      handle
-      body
-      bodySummary
-      url
+      ... on Page {
+        title
+        handle
+        body
+        bodySummary
+      }
     }
   }
 `