diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte
index a1e209f846..b97cd1f5b6 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte
@@ -36,16 +36,19 @@
}
- onClick(detail)}
- schema={dynamicVariableSchema}
- data={dynamicVariables}
- allowEditColumns={false}
- allowEditRows={false}
- allowSelectRows={false}
- customRenderers={[
- { column: "name", component: BoldRenderer },
- { column: "value", component: CodeRenderer },
- ]}
-/>
-
+{#if dynamicVariables.length > 0}
+ onClick(detail)}
+ schema={dynamicVariableSchema}
+ data={dynamicVariables}
+ allowEditColumns={false}
+ allowEditRows={false}
+ allowSelectRows={false}
+ customRenderers={[
+ { column: "name", component: BoldRenderer },
+ { column: "value", component: CodeRenderer },
+ ]}
+ />
+{:else}
+ No dynamic variables specified.
+{/if}
diff --git a/packages/client/src/components/app/DataProvider.svelte b/packages/client/src/components/app/DataProvider.svelte
index 9c35de7870..ec328c60c6 100644
--- a/packages/client/src/components/app/DataProvider.svelte
+++ b/packages/client/src/components/app/DataProvider.svelte
@@ -123,7 +123,7 @@
rows,
info,
schema,
- rowsLength: rows.length,
+ rowsLength: rows?.length,
// Undocumented properties. These aren't supposed to be used in builder
// bindings, but are used internally by other components