diff --git a/e2e/mobile/tests/journey/search.test.ts b/e2e/mobile/tests/journey/search.test.ts
index bf880ec82f198862f66abda8e6d7852dda598208..73eaa87abd8fd2d76feac862c9f0da9e4a5b40c9 100644
--- a/e2e/mobile/tests/journey/search.test.ts
+++ b/e2e/mobile/tests/journey/search.test.ts
@@ -5,7 +5,6 @@ import {
   fillFieldByTestId,
   pressEnter,
   tapOnElementWithTestId,
-  waitForAnyElementWithTestId,
   waitForElementWithTestId,
 } from '@holi/e2e-mobile/helpers/selectors'
 
@@ -42,28 +41,29 @@ describe('@Search', () => {
       return
     }
 
-    // Test search by query - expecting any result
-    const allHitTypes = ['search-hit-volunteering', 'search-hit-profile', 'search-hit-space']
-    await waitForAnyElementWithTestId(allHitTypes)
+    // Volunteering is selected by default
+    await waitForElementWithTestId('search-hit-volunteering')
+
+    // Test search by query
     await fillFieldByTestId('search-input', 'Test')
-    await waitForAnyElementWithTestId(allHitTypes)
+    await waitForElementWithTestId('search-hit-volunteering')
 
     // Clear query to prepare for facet filtering
     await tapOnElementWithTestId('search-input-clear')
-    await waitForAnyElementWithTestId(allHitTypes)
+    await waitForElementWithTestId('search-hit-volunteering')
 
     // Close keyboard by submitting (empty) input
     await pressEnter('search-input')
-    await waitForAnyElementWithTestId(allHitTypes)
-
-    // Test facet filters
-    await tapOnElementWithTestId('facet-volunteering')
     await waitForElementWithTestId('search-hit-volunteering')
 
+    // Test facet filters
     await tapOnElementWithTestId('facet-profile')
     await waitForElementWithTestId('search-hit-profile')
 
     await tapOnElementWithTestId('facet-space')
     await waitForElementWithTestId('search-hit-space')
+
+    await tapOnElementWithTestId('facet-volunteering')
+    await waitForElementWithTestId('search-hit-volunteering')
   })
 })
diff --git a/e2e/web/tests/search.spec.ts b/e2e/web/tests/search.spec.ts
index fba7ed4dce086b2d494798924050980ba7bbbcab..412ae79c6dde6f06be4541b65794b8d9baf040ae 100644
--- a/e2e/web/tests/search.spec.ts
+++ b/e2e/web/tests/search.spec.ts
@@ -14,30 +14,29 @@ test.describe('@Search', () => {
       return
     }
 
-    // Test search by query - expecting any result
-    const allHitTypes = ['search-hit-volunteering', 'search-hit-profile', 'search-hit-space']
-      .map((testID) => byTestId(testID))
-      .join(', ')
-    await page.waitForSelector(allHitTypes)
+    // Volunteering is selected by default
+    await page.waitForSelector(byTestId('search-hit-volunteering'))
+
+    // Test search by query
     const emailInput = await locateElementByTestId(page, 'search-input')
     await emailInput.fill('Test')
-    await page.waitForSelector(allHitTypes)
+    await page.waitForSelector(byTestId('search-hit-volunteering'))
 
     // Clear query to prepare for facet filtering
     await clickElementByTestId(page, 'search-input-clear')
-    await page.waitForSelector(allHitTypes)
+    await page.waitForSelector(byTestId('search-hit-volunteering'))
 
     // Check accessibility
     await checkAccessibility(page)
 
     // Test facet filters
-    await clickElementByTestId(page, 'facet-volunteering')
-    await page.waitForSelector(byTestId('search-hit-volunteering'))
-
     await clickElementByTestId(page, 'facet-profile')
     await page.waitForSelector(byTestId('search-hit-profile'))
 
     await clickElementByTestId(page, 'facet-space')
     await page.waitForSelector(byTestId('search-hit-space'))
+
+    await clickElementByTestId(page, 'facet-volunteering')
+    await page.waitForSelector(byTestId('search-hit-volunteering'))
   })
 })