diff --git a/backend-node/src/controllers/tableManagementController.ts b/backend-node/src/controllers/tableManagementController.ts
index 45d888e1..aaa5d124 100644
--- a/backend-node/src/controllers/tableManagementController.ts
+++ b/backend-node/src/controllers/tableManagementController.ts
@@ -1634,11 +1634,12 @@ export async function getCategoryColumnsByMenu(
     const pool = getPool();
     
     const tablesQuery = `
-      SELECT DISTINCT table_name
-      FROM screen_definitions
-      WHERE menu_objid = ANY($1)
-        AND company_code = $2
-        AND table_name IS NOT NULL
+      SELECT DISTINCT sd.table_name
+      FROM screen_menu_assignments sma
+      INNER JOIN screen_definitions sd ON sma.screen_id = sd.screen_id
+      WHERE sma.menu_objid = ANY($1)
+        AND sma.company_code = $2
+        AND sd.table_name IS NOT NULL
     `;
     
     const tablesResult = await pool.query(tablesQuery, [siblingObjids, companyCode]);