diff --git a/src/components/account/useModerateItemsSearch.ts b/src/components/account/useModerateItemsSearch.ts
index 71197ef6..44a296bc 100644
--- a/src/components/account/useModerateItemsSearch.ts
+++ b/src/components/account/useModerateItemsSearch.ts
@@ -18,12 +18,6 @@ export function useModerateItemsSearch(): UseModerateItemsSearchResult {
   const router = useRouter()
 
   function getSearchModerateItemsLink(query: ModerateItemsPage.SearchParamsInput) {
-    // FIXME: https://github.com/SSHOC/sshoc-marketplace-backend/issues/477#issuecomment-2422307954
-    if (query['d.conflict-at-source'] === false) {
-      // @ts-expect-error It's ok.
-      delete query['d.conflict-at-source']
-    }
-
     /** Filter out empty values to avoid `key=` query parameters. */
     return {
       href: routes.ModerateItemsPage(sanitizeSearchParams(query)),
diff --git a/src/components/account/useModerateItemsSearchResults.ts b/src/components/account/useModerateItemsSearchResults.ts
index 23610673..8cfc2d02 100644
--- a/src/components/account/useModerateItemsSearchResults.ts
+++ b/src/components/account/useModerateItemsSearchResults.ts
@@ -44,6 +44,13 @@ function normalizeSearchFilters(filters: SearchFilters) {
         break
       }
 
+      case 'd.conflict-at-source': {
+        if (value === true) {
+          searchFilters['d.conflict-at-source'] = 'true'
+        }
+        break
+      }
+
       default:
         searchFilters[key] = value
     }