diff --git a/app/(labels)/labels/Search.tsx b/app/(labels)/labels/Search.tsx
index 07d6e0b7..1bdf28fb 100644
--- a/app/(labels)/labels/Search.tsx
+++ b/app/(labels)/labels/Search.tsx
@@ -434,7 +434,7 @@ export default function Search() {
diff --git a/app/(labels)/labels/page.tsx b/app/(labels)/labels/page.tsx
index 6778cb87..18ccdac4 100644
--- a/app/(labels)/labels/page.tsx
+++ b/app/(labels)/labels/page.tsx
@@ -361,12 +361,20 @@ export default function LabelsPage() {
...labelsFilters.subcategory,
];
+ let isUnlabeledSelected = labelsFilters.category.includes("unlabeled");
+
let all_usage_categories = [...new Set(both)];
if (all_usage_categories.length > 0) {
- rows = rows.filter((label) =>
- all_usage_categories.includes(label.usage_category),
- );
+ if (isUnlabeledSelected) {
+ rows = rows.filter((label) =>
+ all_usage_categories.includes(label.usage_category) || label.usage_category === null,
+ );
+ } else {
+ rows = rows.filter((label) =>
+ all_usage_categories.includes(label.usage_category),
+ );
+ }
}
if (labelsFilters.owner_project.length > 0) {