diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
index f736d29bee..b97f23d7a3 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
@@ -175,15 +175,19 @@
onConfirm={datasources.removeSchemaError}
/>
{/if}
-
onClickTable(detail)}
- schema={tableSchema}
- data={Object.values(plusTables)}
- allowEditColumns={false}
- allowEditRows={false}
- allowSelectRows={false}
- customRenderers={[{ column: "primary", component: ArrayRenderer }]}
-/>
+{#if plusTables && Object.values(plusTables).length > 0}
+ onClickTable(detail)}
+ schema={tableSchema}
+ data={Object.values(plusTables)}
+ allowEditColumns={false}
+ allowEditRows={false}
+ allowSelectRows={false}
+ customRenderers={[{ column: "primary", component: ArrayRenderer }]}
+ />
+{:else}
+ No tables found.
+{/if}
{#if plusTables?.length !== 0}