diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json
index 12c57b35..9067bda7 100644
--- a/opensearch_dashboards.json
+++ b/opensearch_dashboards.json
@@ -3,7 +3,7 @@
   "version": "3.0.0.0",
   "opensearchDashboardsVersion": "3.0.0",
   "configPath": ["opensearch_alerting"],
-  "optionalPlugins": ["dataSource", "dataSourceManagement"],
+  "optionalPlugins": ["dataSource", "dataSourceManagement", "assistantDashboards"],
   "requiredPlugins": [
     "uiActions",
     "dashboard",
@@ -17,7 +17,6 @@
     "opensearchDashboardsUtils",
     "contentManagement"
   ],
-  "optionalPlugins": ["assistantDashboards"],
   "server": true,
   "ui": true,
   "supportedOSDataSourceVersions": ">=2.13.0",
diff --git a/public/pages/Dashboard/utils/tableUtils.js b/public/pages/Dashboard/utils/tableUtils.js
index 9959af14..cb5ef97f 100644
--- a/public/pages/Dashboard/utils/tableUtils.js
+++ b/public/pages/Dashboard/utils/tableUtils.js
@@ -235,6 +235,7 @@ export const alertColumns = (
             dsl: dsl,
             index: index,
           },
+          dataSourceId: dataSourceQuery?.query?.dataSourceId,
         };
       };