diff --git a/apps/designer/app/routes/index.tsx b/apps/designer/app/routes/index.tsx
index adc23c943b..7ef1149563 100644
--- a/apps/designer/app/routes/index.tsx
+++ b/apps/designer/app/routes/index.tsx
@@ -37,6 +37,9 @@ export const loader: LoaderFunction = async ({
       if (prodBuild === undefined) {
         throw new Error(`Site is not published`);
       }
+
+      // @todo: use a correct page rather than homePage
+
       const [tree, props, breakpoints] = await Promise.all([
         db.tree.loadById(prodBuild.pages.homePage.treeId),
         db.props.loadByTreeId(prodBuild.pages.homePage.treeId),
diff --git a/apps/designer/app/routes/rest/props.$projectId.ts b/apps/designer/app/routes/rest/props.$projectId.ts
index 0b7656cbb2..cc240b1b06 100644
--- a/apps/designer/app/routes/rest/props.$projectId.ts
+++ b/apps/designer/app/routes/rest/props.$projectId.ts
@@ -20,6 +20,8 @@ export const loader: LoaderFunction = async ({
         `Project ${params.projectId} needs to be published first`
       );
     }
+
+    // @todo: use a correct page rather than homePage
     return await db.props.loadByTreeId(prodBuild.pages.homePage.treeId);
   } catch (error) {
     if (error instanceof Error) {
diff --git a/apps/designer/app/routes/rest/tree.$projectId.ts b/apps/designer/app/routes/rest/tree.$projectId.ts
index 506dba56ef..7d670ec5f8 100644
--- a/apps/designer/app/routes/rest/tree.$projectId.ts
+++ b/apps/designer/app/routes/rest/tree.$projectId.ts
@@ -21,6 +21,7 @@ export const loader: LoaderFunction = async ({
       );
     }
 
+    // @todo: use a correct page rather than homePage
     return await db.tree.loadById(prodBuild.pages.homePage.treeId);
   } catch (error) {
     if (error instanceof Error) {
diff --git a/apps/designer/app/shared/db/canvas.server.ts b/apps/designer/app/shared/db/canvas.server.ts
index 2796ca7a38..49d0901821 100644
--- a/apps/designer/app/shared/db/canvas.server.ts
+++ b/apps/designer/app/shared/db/canvas.server.ts
@@ -15,6 +15,7 @@ const loadData = async (projectId: Project["id"]) => {
 
   const devBuild = await db.build.loadByProjectId(projectId, "dev");
 
+  // @todo: use a correct page rather than homePage
   const [tree, props, breakpoints] = await Promise.all([
     db.tree.loadById(devBuild.pages.homePage.treeId),
     db.props.loadByTreeId(devBuild.pages.homePage.treeId),