diff --git a/packages/standard-components/src/charts/BarChart.svelte b/packages/standard-components/src/charts/BarChart.svelte
index b29d11fcec..e1005492cc 100644
--- a/packages/standard-components/src/charts/BarChart.svelte
+++ b/packages/standard-components/src/charts/BarChart.svelte
@@ -5,6 +5,7 @@
   import { isEmpty } from "lodash/fp"
 
   const { API } = getContext("app")
+  const dataContext = getContext("data")
 
   export let title
   export let datasource
@@ -35,7 +36,7 @@
 
     // Fetch, filter and sort data
     const schema = (await API.fetchTableDefinition(datasource.tableId)).schema
-    const result = await API.fetchDatasource(datasource)
+    const result = await API.fetchDatasource(datasource, $dataContext)
     const reducer = row => (valid, column) => valid && row[column] != null
     const hasAllColumns = row => allCols.reduce(reducer(row), true)
     const data = result
diff --git a/packages/standard-components/src/charts/CandleStickChart.svelte b/packages/standard-components/src/charts/CandleStickChart.svelte
index 05902b0a77..5de1450d95 100644
--- a/packages/standard-components/src/charts/CandleStickChart.svelte
+++ b/packages/standard-components/src/charts/CandleStickChart.svelte
@@ -5,6 +5,7 @@
   import { isEmpty } from "lodash/fp"
 
   const { API } = getContext("app")
+  const dataContext = getContext("data")
 
   export let title
   export let datasource
@@ -33,7 +34,7 @@
 
     // Fetch, filter and sort data
     const schema = (await API.fetchTableDefinition(datasource.tableId)).schema
-    const result = await API.fetchDatasource(datasource)
+    const result = await API.fetchDatasource(datasource, $dataContext)
     const reducer = row => (valid, column) => valid && row[column] != null
     const hasAllColumns = row => allCols.reduce(reducer(row), true)
     const data = result
diff --git a/packages/standard-components/src/charts/PieChart.svelte b/packages/standard-components/src/charts/PieChart.svelte
index 4f71043668..01d6cf5ef1 100644
--- a/packages/standard-components/src/charts/PieChart.svelte
+++ b/packages/standard-components/src/charts/PieChart.svelte
@@ -5,6 +5,7 @@
   import { isEmpty } from "lodash/fp"
 
   const { API } = getContext("app")
+  const dataContext = getContext("data")
 
   export let title
   export let datasource
@@ -31,7 +32,7 @@
 
     // Fetch, filter and sort data
     const schema = (await API.fetchTableDefinition(datasource.tableId)).schema
-    const result = await API.fetchDatasource(datasource)
+    const result = await API.fetchDatasource(datasource, $dataContext)
     const data = result
       .filter(row => row[labelColumn] != null && row[valueColumn] != null)
       .slice(0, 20)
diff --git a/packages/standard-components/src/grid/Component.svelte b/packages/standard-components/src/grid/Component.svelte
index 639cf88aed..23beef81dd 100644
--- a/packages/standard-components/src/grid/Component.svelte
+++ b/packages/standard-components/src/grid/Component.svelte
@@ -15,6 +15,7 @@
   // These maps need to be set up to handle whatever types that are used in the tables.
   const setters = new Map([["number", number]])
   const SDK = getContext("app")
+  const dataContext = getContext("data")
   const { API, styleable } = SDK
 
   export let datasource = {}
@@ -52,7 +53,7 @@
 
   onMount(async () => {
     if (!isEmpty(datasource)) {
-      data = await API.fetchDatasource(datasource)
+      data = await API.fetchDatasource(datasource, $dataContext)
       let schema
 
       // Get schema for datasource