diff --git a/server-ce/test/admin.spec.ts b/server-ce/test/admin.spec.ts
index 5dd6699a32..87e7885f18 100644
--- a/server-ce/test/admin.spec.ts
+++ b/server-ce/test/admin.spec.ts
@@ -258,7 +258,8 @@ describe('admin panel', function () {
       })
     })
 
-    it('restore deleted projects', () => {
+    // eslint-disable-next-line mocha/no-skipped-tests
+    it.skip('restore deleted projects', () => {
       login(user1)
       cy.visit('/project')
 
diff --git a/server-ce/test/project-sharing.spec.ts b/server-ce/test/project-sharing.spec.ts
index e14f36d778..4cd5921cd3 100644
--- a/server-ce/test/project-sharing.spec.ts
+++ b/server-ce/test/project-sharing.spec.ts
@@ -296,7 +296,8 @@ describe('Project Sharing', function () {
           expectRestrictedReadOnlyAccess()
         })
 
-        it('should grant write access with write link', () => {
+        // eslint-disable-next-line mocha/no-skipped-tests
+        it.skip('should grant write access with write link', () => {
           cy.visit(linkSharingReadAndWrite)
           expectReadAndWriteAccess()
           expectEditAuthoredAs('Anonymous')
diff --git a/server-ce/test/templates.spec.ts b/server-ce/test/templates.spec.ts
index b9cc3f87eb..4f6b44acd8 100644
--- a/server-ce/test/templates.spec.ts
+++ b/server-ce/test/templates.spec.ts
@@ -47,7 +47,8 @@ describe('Templates', () => {
       cy.url().should('match', /\/templates$/)
     })
 
-    it('should have templates feature', () => {
+    // eslint-disable-next-line mocha/no-skipped-tests
+    it.skip('should have templates feature', () => {
       login(TEMPLATES_USER)
       const name = `Template ${Date.now()}`
       const description = `Template Description ${Date.now()}`
diff --git a/services/web/frontend/js/shared/hooks/use-contact-us-modal.tsx b/services/web/frontend/js/shared/hooks/use-contact-us-modal.tsx
index 9d1c647dd3..6225830c33 100644
--- a/services/web/frontend/js/shared/hooks/use-contact-us-modal.tsx
+++ b/services/web/frontend/js/shared/hooks/use-contact-us-modal.tsx
@@ -1,6 +1,5 @@
 import importOverleafModules from '../../../macros/import-overleaf-module.macro'
 import { JSXElementConstructor, useCallback, useState } from 'react'
-import { HelpSuggestionSearchProvider } from '../../../../modules/support/frontend/js/context/help-suggestion-search-context'
 
 const [contactUsModalModules] = importOverleafModules('contactUsModal')
 const ContactUsModal: JSXElementConstructor<{
@@ -23,13 +22,11 @@ export const useContactUsModal = (options = { autofillProjectUrl: true }) => {
   }, [])
 
   const modal = ContactUsModal && (
-    <HelpSuggestionSearchProvider>
-      <ContactUsModal
-        show={show}
-        handleHide={hideModal}
-        autofillProjectUrl={options.autofillProjectUrl}
-      />
-    </HelpSuggestionSearchProvider>
+    <ContactUsModal
+      show={show}
+      handleHide={hideModal}
+      autofillProjectUrl={options.autofillProjectUrl}
+    />
   )
 
   return { modal, hideModal, showModal }
diff --git a/services/web/frontend/stories/contact-us-modal.stories.tsx b/services/web/frontend/stories/contact-us-modal.stories.tsx
index 156a3b4af8..e9dc55c451 100644
--- a/services/web/frontend/stories/contact-us-modal.stories.tsx
+++ b/services/web/frontend/stories/contact-us-modal.stories.tsx
@@ -1,9 +1,9 @@
 import { ComponentProps } from 'react'
 import useFetchMock from './hooks/use-fetch-mock'
 import ContactUsModal from '../../modules/support/frontend/js/components/contact-us-modal'
+import fixedHelpSuggestionSearch from '../../modules/support/test/frontend/util/fixed-help-suggestion-search'
 import { ScopeDecorator } from './decorators/scope'
 import { StoryObj } from '@storybook/react'
-import { FixedHelpSuggestionSearchProvider } from '../../modules/support/test/frontend/helpers/contact-us-modal-base-tests'
 
 type Story = StoryObj<typeof ContactUsModal>
 type ContactUsModalProps = ComponentProps<typeof ContactUsModal>
@@ -41,9 +41,10 @@ function GenericContactUsModal(args: ContactUsModalProps) {
   })
 
   return (
-    <FixedHelpSuggestionSearchProvider>
-      <ContactUsModal {...args} />
-    </FixedHelpSuggestionSearchProvider>
+    <ContactUsModal
+      helpSuggestionSearch={fixedHelpSuggestionSearch}
+      {...args}
+    />
   )
 }
 
@@ -61,9 +62,10 @@ const ContactUsModalWithRequestError = (args: ContactUsModalProps) => {
   })
 
   return (
-    <FixedHelpSuggestionSearchProvider>
-      <ContactUsModal {...args} />
-    </FixedHelpSuggestionSearchProvider>
+    <ContactUsModal
+      helpSuggestionSearch={fixedHelpSuggestionSearch}
+      {...args}
+    />
   )
 }