diff --git a/plugins/dbgate-plugin-duckdb/src/backend/Analyser.js b/plugins/dbgate-plugin-duckdb/src/backend/Analyser.js
index 1880b095f..73399d062 100644
--- a/plugins/dbgate-plugin-duckdb/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-duckdb/src/backend/Analyser.js
@@ -31,7 +31,7 @@ class Analyser extends DatabaseAnalyser {
     const foreignKeysResult = await this.analyserQuery('foreignKeys', ['tables']);
     const primaryKeysResult = await this.analyserQuery('primaryKeys', ['tables']);
     const uniquesResults = await this.analyserQuery('uniques', ['tables']);
-    const indexesResult = await this.analyserQuery('uniques', ['indexes']);
+    const indexesResult = await this.analyserQuery('indexes', ['tables']);
     const viewsResult = await this.analyserQuery('views', ['views']);
 
     /**
diff --git a/plugins/dbgate-plugin-duckdb/src/backend/extractIndexColumns.js b/plugins/dbgate-plugin-duckdb/src/backend/extractIndexColumns.js
index 8d93d17a1..b29e772e7 100644
--- a/plugins/dbgate-plugin-duckdb/src/backend/extractIndexColumns.js
+++ b/plugins/dbgate-plugin-duckdb/src/backend/extractIndexColumns.js
@@ -56,6 +56,7 @@ function clean(segment) {
 }
 
 function extractIndexColumns(sql) {
+  if (!sql) return [];
   const sqlText = sql // your variable
     .replace(/\s+/g, ' ') // collapse whitespace
     .replace(/--.*?$/gm, '') // strip line comments