diff --git a/packages/frontend-core/src/fetch/DataFetch.ts b/packages/frontend-core/src/fetch/DataFetch.ts
index 3e2b0d7dcf..b5eb774e45 100644
--- a/packages/frontend-core/src/fetch/DataFetch.ts
+++ b/packages/frontend-core/src/fetch/DataFetch.ts
@@ -360,12 +360,11 @@ export default abstract class DataFetch<
 
   /**
    * Gets the schema definition for a datasource.
-   * @param datasource the datasource
    * @param definition the datasource definition
    * @return {object} the schema
    */
-  getSchema(_datasource: TDatasource | null, definition: TDefinition | null) {
-    return definition?.schema
+  getSchema(definition: TDefinition | null): Record<string, any> | undefined {
+    return definition?.schema ?? undefined
   }
 
   /**
diff --git a/packages/frontend-core/src/fetch/ViewFetch.ts b/packages/frontend-core/src/fetch/ViewFetch.ts
index fe891b9e66..2238d226ab 100644
--- a/packages/frontend-core/src/fetch/ViewFetch.ts
+++ b/packages/frontend-core/src/fetch/ViewFetch.ts
@@ -19,7 +19,8 @@ export default class ViewFetch extends DataFetch<ViewV1, Table> {
     }
   }
 
-  getSchema(datasource: ViewV1, definition: Table) {
+  getSchema(definition: Table) {
+    const { datasource } = this.options
     return definition?.views?.[datasource.name]?.schema
   }
 
diff --git a/packages/frontend-core/src/fetch/index.ts b/packages/frontend-core/src/fetch/index.ts
index 4f4eafe8e8..52233bd3fb 100644
--- a/packages/frontend-core/src/fetch/index.ts
+++ b/packages/frontend-core/src/fetch/index.ts
@@ -76,5 +76,5 @@ export const getDatasourceSchema = ({
   definition?: { schema?: TableSchema }
 }) => {
   const instance = createEmptyFetchInstance({ API, datasource })
-  return instance?.getSchema(datasource, definition)
+  return instance?.getSchema(definition)
 }