diff --git a/web/src/components/metadata-filter/index.tsx b/web/src/components/metadata-filter/index.tsx
index e87fc07c8e..6b2ebbdc70 100644
--- a/web/src/components/metadata-filter/index.tsx
+++ b/web/src/components/metadata-filter/index.tsx
@@ -50,10 +50,18 @@ export function MetadataFilter({
 
   const methodName = prefix + 'meta_data_filter.method';
 
-  const kbIds: string[] = useWatch({
+  const datasetIds: string[] = useWatch({
     control: form.control,
     name: prefix + 'dataset_ids',
   });
+
+  const oldKbIds: string[] = useWatch({
+    control: form.control,
+    name: prefix + 'kb_ids',
+  });
+
+  const kbIds = datasetIds || oldKbIds || [];
+
   const metadata = useWatch({
     control: form.control,
     name: methodName,
diff --git a/web/src/pages/dataset/dataset/index.tsx b/web/src/pages/dataset/dataset/index.tsx
index 4e09317150..16af309392 100644
--- a/web/src/pages/dataset/dataset/index.tsx
+++ b/web/src/pages/dataset/dataset/index.tsx
@@ -14,7 +14,10 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu';
-import { useRowSelection } from '@/hooks/logic-hooks/use-row-selection';
+import {
+  useRowSelection,
+  useSelectedIds,
+} from '@/hooks/logic-hooks/use-row-selection';
 import { useFetchDocumentList } from '@/hooks/use-document-request';
 import { useFetchKnowledgeBaseConfiguration } from '@/hooks/use-knowledge-request';
 import { LucidePlus } from 'lucide-react';
@@ -93,6 +96,11 @@ export default function Dataset() {
     setRowSelection,
   });
 
+  const { selectedIds: selectedRowKeys } = useSelectedIds(
+    rowSelection,
+    documents,
+  );
+
   const handleAddMetadataWithDocuments = () => {
     showManageMetadataModal({
       type: MetadataType.Manage,
@@ -117,7 +125,7 @@ export default function Dataset() {
           </div> */}
         </div>
       ),
-      documentIds: documents.map((doc) => doc.id),
+      documentIds: selectedRowKeys,
     });
   };