From e4c8ac82bd9b6a7c349d990d8acc5e414106d6bf Mon Sep 17 00:00:00 2001
From: Echo <ChaosExAnima@users.noreply.github.com>
Date: Thu, 7 May 2026 11:09:27 +0200
Subject: [PATCH] [Glitch] Swap from React Helmet to Unhead

Port d0c8eb2f1b37c8952987172c93815f58a63d8e80 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/components/account_header/index.tsx       | 3 ++-
 app/javascript/flavours/glitch/components/error_boundary.jsx  | 2 +-
 app/javascript/flavours/glitch/containers/mastodon.jsx        | 2 +-
 app/javascript/flavours/glitch/features/about/index.jsx       | 2 +-
 .../glitch/features/account_edit/components/column.tsx        | 3 ++-
 .../flavours/glitch/features/bookmarked_statuses/index.tsx    | 2 +-
 .../flavours/glitch/features/collections/detail/index.tsx     | 3 ++-
 .../flavours/glitch/features/collections/editor/index.tsx     | 3 ++-
 app/javascript/flavours/glitch/features/collections/index.tsx | 3 ++-
 .../flavours/glitch/features/community_timeline/index.jsx     | 2 +-
 app/javascript/flavours/glitch/features/compose/index.tsx     | 3 ++-
 .../flavours/glitch/features/direct_timeline/index.jsx        | 2 +-
 app/javascript/flavours/glitch/features/directory/index.tsx   | 4 ++--
 .../flavours/glitch/features/domain_blocks/index.tsx          | 2 +-
 app/javascript/flavours/glitch/features/explore/index.tsx     | 3 ++-
 .../flavours/glitch/features/favourited_statuses/index.tsx    | 2 +-
 app/javascript/flavours/glitch/features/favourites/index.jsx  | 2 +-
 app/javascript/flavours/glitch/features/firehose/index.jsx    | 2 +-
 .../flavours/glitch/features/follow_requests/index.jsx        | 2 +-
 .../flavours/glitch/features/followed_tags/index.tsx          | 4 ++--
 .../flavours/glitch/features/getting_started/index.tsx        | 2 +-
 .../flavours/glitch/features/hashtag_timeline/index.jsx       | 2 +-
 .../flavours/glitch/features/home_timeline/index.jsx          | 2 +-
 .../flavours/glitch/features/keyboard_shortcuts/index.jsx     | 2 +-
 .../flavours/glitch/features/link_timeline/index.tsx          | 3 ++-
 .../flavours/glitch/features/list_timeline/index.jsx          | 2 +-
 app/javascript/flavours/glitch/features/lists/index.tsx       | 3 ++-
 app/javascript/flavours/glitch/features/lists/members.tsx     | 3 ++-
 app/javascript/flavours/glitch/features/lists/new.tsx         | 3 ++-
 app/javascript/flavours/glitch/features/mutes/index.jsx       | 2 +-
 .../flavours/glitch/features/notifications/request.jsx        | 2 +-
 .../flavours/glitch/features/notifications/requests.jsx       | 2 +-
 .../flavours/glitch/features/notifications_v2/index.tsx       | 3 +--
 .../flavours/glitch/features/onboarding/follows.tsx           | 2 +-
 .../flavours/glitch/features/onboarding/profile.tsx           | 3 ++-
 .../flavours/glitch/features/pinned_statuses/index.jsx        | 2 +-
 .../flavours/glitch/features/privacy_policy/index.tsx         | 2 +-
 .../flavours/glitch/features/public_timeline/index.jsx        | 2 +-
 app/javascript/flavours/glitch/features/quotes/index.tsx      | 4 ++--
 app/javascript/flavours/glitch/features/reblogs/index.jsx     | 2 +-
 app/javascript/flavours/glitch/features/search/index.tsx      | 2 +-
 app/javascript/flavours/glitch/features/status/index.jsx      | 2 +-
 .../flavours/glitch/features/terms_of_service/index.tsx       | 3 ++-
 .../glitch/features/ui/components/bundle_column_error.jsx     | 2 +-
 .../flavours/glitch/features/ui/components/modal_root.jsx     | 2 +-
 45 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/account_header/index.tsx b/app/javascript/flavours/glitch/components/account_header/index.tsx
index 565b9aaefb..cc766d8ec2 100644
--- a/app/javascript/flavours/glitch/components/account_header/index.tsx
+++ b/app/javascript/flavours/glitch/components/account_header/index.tsx
@@ -1,7 +1,8 @@
 import { useCallback } from 'react';
 
 import classNames from 'classnames';
-import { Helmet } from 'react-helmet';
+
+import { Helmet } from '@unhead/react/helmet';
 
 import { openModal } from '@/flavours/glitch/actions/modal';
 import FollowRequestNoteContainer from '@/flavours/glitch/features/account/containers/follow_request_note_container';
diff --git a/app/javascript/flavours/glitch/components/error_boundary.jsx b/app/javascript/flavours/glitch/components/error_boundary.jsx
index 82ea7dc89f..82de329e79 100644
--- a/app/javascript/flavours/glitch/components/error_boundary.jsx
+++ b/app/javascript/flavours/glitch/components/error_boundary.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import StackTrace from 'stacktrace-js';
 
diff --git a/app/javascript/flavours/glitch/containers/mastodon.jsx b/app/javascript/flavours/glitch/containers/mastodon.jsx
index 0eb0f749f2..180024f438 100644
--- a/app/javascript/flavours/glitch/containers/mastodon.jsx
+++ b/app/javascript/flavours/glitch/containers/mastodon.jsx
@@ -1,6 +1,6 @@
 import { PureComponent } from 'react';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 import { Route } from 'react-router-dom';
 
 import { Provider as ReduxProvider } from 'react-redux';
diff --git a/app/javascript/flavours/glitch/features/about/index.jsx b/app/javascript/flavours/glitch/features/about/index.jsx
index 60a2d68f2f..207900f673 100644
--- a/app/javascript/flavours/glitch/features/about/index.jsx
+++ b/app/javascript/flavours/glitch/features/about/index.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { defineMessages, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
diff --git a/app/javascript/flavours/glitch/features/account_edit/components/column.tsx b/app/javascript/flavours/glitch/features/account_edit/components/column.tsx
index 5cfbf42092..79e63b8019 100644
--- a/app/javascript/flavours/glitch/features/account_edit/components/column.tsx
+++ b/app/javascript/flavours/glitch/features/account_edit/components/column.tsx
@@ -2,9 +2,10 @@ import type { FC } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
 import { Link } from 'react-router-dom';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import { Column } from '@/flavours/glitch/components/column';
 import { ColumnHeader } from '@/flavours/glitch/components/column_header';
 import { LoadingIndicator } from '@/flavours/glitch/components/loading_indicator';
diff --git a/app/javascript/flavours/glitch/features/bookmarked_statuses/index.tsx b/app/javascript/flavours/glitch/features/bookmarked_statuses/index.tsx
index a2a2bd790b..fbea34b713 100644
--- a/app/javascript/flavours/glitch/features/bookmarked_statuses/index.tsx
+++ b/app/javascript/flavours/glitch/features/bookmarked_statuses/index.tsx
@@ -2,7 +2,7 @@ import { useEffect, useRef, useCallback } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
 import {
diff --git a/app/javascript/flavours/glitch/features/collections/detail/index.tsx b/app/javascript/flavours/glitch/features/collections/detail/index.tsx
index 3f75a904d7..151bf8ff17 100644
--- a/app/javascript/flavours/glitch/features/collections/detail/index.tsx
+++ b/app/javascript/flavours/glitch/features/collections/detail/index.tsx
@@ -2,10 +2,11 @@ import { useCallback, useEffect } from 'react';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
 import { useHistory, useLocation, useParams } from 'react-router';
 import { Link } from 'react-router-dom';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import HelpIcon from '@/material-icons/400-24px/help.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import ShareIcon from '@/material-icons/400-24px/share.svg?react';
diff --git a/app/javascript/flavours/glitch/features/collections/editor/index.tsx b/app/javascript/flavours/glitch/features/collections/editor/index.tsx
index c50edc8ba7..ed7cba63b7 100644
--- a/app/javascript/flavours/glitch/features/collections/editor/index.tsx
+++ b/app/javascript/flavours/glitch/features/collections/editor/index.tsx
@@ -2,7 +2,6 @@ import { useEffect } from 'react';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
 import {
   Switch,
   Route,
@@ -12,6 +11,8 @@ import {
   useLocation,
 } from 'react-router-dom';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import { Callout } from '@/flavours/glitch/components/callout';
 import { useCurrentAccountId } from '@/flavours/glitch/hooks/useAccountId';
 import { initialState } from '@/flavours/glitch/initial_state';
diff --git a/app/javascript/flavours/glitch/features/collections/index.tsx b/app/javascript/flavours/glitch/features/collections/index.tsx
index b38978f313..76cf8fc262 100644
--- a/app/javascript/flavours/glitch/features/collections/index.tsx
+++ b/app/javascript/flavours/glitch/features/collections/index.tsx
@@ -1,8 +1,9 @@
 import { defineMessages, useIntl } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
 import { Route, Switch, useRouteMatch } from 'react-router-dom';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import { TabLink, TabList } from '@/flavours/glitch/components/tab_list';
 import { Column } from 'flavours/glitch/components/column';
 import { ColumnHeader } from 'flavours/glitch/components/column_header';
diff --git a/app/javascript/flavours/glitch/features/community_timeline/index.jsx b/app/javascript/flavours/glitch/features/community_timeline/index.jsx
index 3845f3063f..27eca02946 100644
--- a/app/javascript/flavours/glitch/features/community_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/community_timeline/index.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { defineMessages, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import { connect } from 'react-redux';
 
diff --git a/app/javascript/flavours/glitch/features/compose/index.tsx b/app/javascript/flavours/glitch/features/compose/index.tsx
index 56e91b7f48..f9a9e9031f 100644
--- a/app/javascript/flavours/glitch/features/compose/index.tsx
+++ b/app/javascript/flavours/glitch/features/compose/index.tsx
@@ -2,11 +2,12 @@ import { useEffect, useCallback, useState } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
 import { Link } from 'react-router-dom';
 
 import type { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import elephantUIPlane from '@/images/elephant_ui_plane.svg';
 import EditIcon from '@/material-icons/400-24px/edit_square.svg?react';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/index.jsx b/app/javascript/flavours/glitch/features/direct_timeline/index.jsx
index 25f0dd9997..95aadc387b 100644
--- a/app/javascript/flavours/glitch/features/direct_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/direct_timeline/index.jsx
@@ -3,7 +3,7 @@ import { useRef, useCallback, useEffect } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import { useDispatch, useSelector } from 'react-redux';
 
diff --git a/app/javascript/flavours/glitch/features/directory/index.tsx b/app/javascript/flavours/glitch/features/directory/index.tsx
index 2a53e68297..c6b1f5d8c7 100644
--- a/app/javascript/flavours/glitch/features/directory/index.tsx
+++ b/app/javascript/flavours/glitch/features/directory/index.tsx
@@ -3,10 +3,10 @@ import { useCallback, useEffect, useRef } from 'react';
 
 import { defineMessages, useIntl } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
-
 import { List as ImmutableList } from 'immutable';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import {
   addColumn,
diff --git a/app/javascript/flavours/glitch/features/domain_blocks/index.tsx b/app/javascript/flavours/glitch/features/domain_blocks/index.tsx
index 9a88d01525..117007c724 100644
--- a/app/javascript/flavours/glitch/features/domain_blocks/index.tsx
+++ b/app/javascript/flavours/glitch/features/domain_blocks/index.tsx
@@ -2,7 +2,7 @@ import { useEffect, useRef, useCallback, useState } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import BlockIcon from '@/material-icons/400-24px/block-fill.svg?react';
 import { apiGetDomainBlocks } from 'flavours/glitch/api/domain_blocks';
diff --git a/app/javascript/flavours/glitch/features/explore/index.tsx b/app/javascript/flavours/glitch/features/explore/index.tsx
index 1bfa5bb6b3..e147fdd978 100644
--- a/app/javascript/flavours/glitch/features/explore/index.tsx
+++ b/app/javascript/flavours/glitch/features/explore/index.tsx
@@ -2,9 +2,10 @@ import { useCallback, useRef } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
 import { NavLink, Switch, Route } from 'react-router-dom';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import TrendingUpIcon from '@/material-icons/400-24px/trending_up.svg?react';
 import { Column } from 'flavours/glitch/components/column';
 import type { ColumnRef } from 'flavours/glitch/components/column';
diff --git a/app/javascript/flavours/glitch/features/favourited_statuses/index.tsx b/app/javascript/flavours/glitch/features/favourited_statuses/index.tsx
index 1f0b875944..dab9ca7dbe 100644
--- a/app/javascript/flavours/glitch/features/favourited_statuses/index.tsx
+++ b/app/javascript/flavours/glitch/features/favourited_statuses/index.tsx
@@ -2,7 +2,7 @@ import { useEffect, useRef, useCallback } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import {
diff --git a/app/javascript/flavours/glitch/features/favourites/index.jsx b/app/javascript/flavours/glitch/features/favourites/index.jsx
index 14bd9c3ac9..830bc4dc4c 100644
--- a/app/javascript/flavours/glitch/features/favourites/index.jsx
+++ b/app/javascript/flavours/glitch/features/favourites/index.jsx
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 
 import { defineMessages, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
diff --git a/app/javascript/flavours/glitch/features/firehose/index.jsx b/app/javascript/flavours/glitch/features/firehose/index.jsx
index 4d70642e3c..baa0c07c75 100644
--- a/app/javascript/flavours/glitch/features/firehose/index.jsx
+++ b/app/javascript/flavours/glitch/features/firehose/index.jsx
@@ -3,7 +3,7 @@ import { useRef, useCallback, useEffect } from 'react';
 
 import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 import { NavLink } from 'react-router-dom';
 
 import { useIdentity } from '@/flavours/glitch/identity_context';
diff --git a/app/javascript/flavours/glitch/features/follow_requests/index.jsx b/app/javascript/flavours/glitch/features/follow_requests/index.jsx
index eff7aed1ab..34f6a15f7a 100644
--- a/app/javascript/flavours/glitch/features/follow_requests/index.jsx
+++ b/app/javascript/flavours/glitch/features/follow_requests/index.jsx
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 
 import { defineMessages, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
diff --git a/app/javascript/flavours/glitch/features/followed_tags/index.tsx b/app/javascript/flavours/glitch/features/followed_tags/index.tsx
index cfe199eb4c..37ec13481e 100644
--- a/app/javascript/flavours/glitch/features/followed_tags/index.tsx
+++ b/app/javascript/flavours/glitch/features/followed_tags/index.tsx
@@ -2,10 +2,10 @@ import { useEffect, useCallback, useRef } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
-
 import { isFulfilled } from '@reduxjs/toolkit';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import {
   fetchFollowedHashtags,
diff --git a/app/javascript/flavours/glitch/features/getting_started/index.tsx b/app/javascript/flavours/glitch/features/getting_started/index.tsx
index 23a0d4b433..f30598bb49 100644
--- a/app/javascript/flavours/glitch/features/getting_started/index.tsx
+++ b/app/javascript/flavours/glitch/features/getting_started/index.tsx
@@ -1,6 +1,6 @@
 import { useIntl } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import { Column } from 'flavours/glitch/components/column';
 
diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx b/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
index 4483d7a760..fbd78eea65 100644
--- a/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import { connect } from 'react-redux';
 
diff --git a/app/javascript/flavours/glitch/features/home_timeline/index.jsx b/app/javascript/flavours/glitch/features/home_timeline/index.jsx
index ee83e1bbc9..483eb46a69 100644
--- a/app/javascript/flavours/glitch/features/home_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/home_timeline/index.jsx
@@ -4,7 +4,7 @@ import { PureComponent } from 'react';
 import { defineMessages, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import { connect } from 'react-redux';
 
diff --git a/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx b/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx
index 7faf1209f8..aa656fc2b8 100644
--- a/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx
+++ b/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 
 import { defineMessages, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
diff --git a/app/javascript/flavours/glitch/features/link_timeline/index.tsx b/app/javascript/flavours/glitch/features/link_timeline/index.tsx
index c615b25b39..72e1f61fad 100644
--- a/app/javascript/flavours/glitch/features/link_timeline/index.tsx
+++ b/app/javascript/flavours/glitch/features/link_timeline/index.tsx
@@ -1,8 +1,9 @@
 import { useRef, useEffect, useCallback } from 'react';
 
-import { Helmet } from 'react-helmet';
 import { useParams } from 'react-router-dom';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import TrendingUpIcon from '@/material-icons/400-24px/trending_up.svg?react';
 import { expandLinkTimeline } from 'flavours/glitch/actions/timelines';
 import { Column } from 'flavours/glitch/components/column';
diff --git a/app/javascript/flavours/glitch/features/list_timeline/index.jsx b/app/javascript/flavours/glitch/features/list_timeline/index.jsx
index 5b8194f666..9a5e47af4c 100644
--- a/app/javascript/flavours/glitch/features/list_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/list_timeline/index.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 import { Link, withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
diff --git a/app/javascript/flavours/glitch/features/lists/index.tsx b/app/javascript/flavours/glitch/features/lists/index.tsx
index 5aca35bffb..197e3cab9b 100644
--- a/app/javascript/flavours/glitch/features/lists/index.tsx
+++ b/app/javascript/flavours/glitch/features/lists/index.tsx
@@ -2,9 +2,10 @@ import { useEffect, useMemo, useCallback } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
 import { Link } from 'react-router-dom';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import AddIcon from '@/material-icons/400-24px/add.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
diff --git a/app/javascript/flavours/glitch/features/lists/members.tsx b/app/javascript/flavours/glitch/features/lists/members.tsx
index 9df96cf7c2..16424474a2 100644
--- a/app/javascript/flavours/glitch/features/lists/members.tsx
+++ b/app/javascript/flavours/glitch/features/lists/members.tsx
@@ -2,9 +2,10 @@ import { useCallback, useState, useEffect } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
 import { useParams, Link } from 'react-router-dom';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import SquigglyArrow from '@/svg-icons/squiggly_arrow.svg?react';
 import { fetchRelationships } from 'flavours/glitch/actions/accounts';
diff --git a/app/javascript/flavours/glitch/features/lists/new.tsx b/app/javascript/flavours/glitch/features/lists/new.tsx
index c3415d6b7c..1ba356dd10 100644
--- a/app/javascript/flavours/glitch/features/lists/new.tsx
+++ b/app/javascript/flavours/glitch/features/lists/new.tsx
@@ -2,11 +2,12 @@ import { useCallback, useState, useEffect } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
 import { useParams, useHistory, Link } from 'react-router-dom';
 
 import { isFulfilled } from '@reduxjs/toolkit';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import { fetchList } from 'flavours/glitch/actions/lists';
diff --git a/app/javascript/flavours/glitch/features/mutes/index.jsx b/app/javascript/flavours/glitch/features/mutes/index.jsx
index d02f1b23ca..7f579e33d2 100644
--- a/app/javascript/flavours/glitch/features/mutes/index.jsx
+++ b/app/javascript/flavours/glitch/features/mutes/index.jsx
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 
 import { defineMessages, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
diff --git a/app/javascript/flavours/glitch/features/notifications/request.jsx b/app/javascript/flavours/glitch/features/notifications/request.jsx
index 910e31997b..bfaed4ff96 100644
--- a/app/javascript/flavours/glitch/features/notifications/request.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/request.jsx
@@ -3,7 +3,7 @@ import { useRef, useCallback, useEffect } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import { useSelector, useDispatch } from 'react-redux';
 
diff --git a/app/javascript/flavours/glitch/features/notifications/requests.jsx b/app/javascript/flavours/glitch/features/notifications/requests.jsx
index 606417c819..08847abda8 100644
--- a/app/javascript/flavours/glitch/features/notifications/requests.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/requests.jsx
@@ -3,7 +3,7 @@ import { useRef, useCallback, useEffect, useState } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import { useSelector, useDispatch } from 'react-redux';
 
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/index.tsx b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
index 73dc3d6593..9cdca8daee 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
@@ -2,8 +2,7 @@ import { useCallback, useEffect, useMemo, useRef } from 'react';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
-
+import { Helmet } from '@unhead/react/helmet';
 import { isEqual } from 'lodash';
 import { useDebouncedCallback } from 'use-debounce';
 
diff --git a/app/javascript/flavours/glitch/features/onboarding/follows.tsx b/app/javascript/flavours/glitch/features/onboarding/follows.tsx
index ffd1a8dcdc..e8ab620929 100644
--- a/app/javascript/flavours/glitch/features/onboarding/follows.tsx
+++ b/app/javascript/flavours/glitch/features/onboarding/follows.tsx
@@ -2,9 +2,9 @@ import { useEffect, useState, useCallback, useRef } from 'react';
 
 import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
 import { Link } from 'react-router-dom';
 
+import { Helmet } from '@unhead/react/helmet';
 import { useDebouncedCallback } from 'use-debounce';
 
 import PersonIcon from '@/material-icons/400-24px/person.svg?react';
diff --git a/app/javascript/flavours/glitch/features/onboarding/profile.tsx b/app/javascript/flavours/glitch/features/onboarding/profile.tsx
index 0f524b2d45..2735d13ce7 100644
--- a/app/javascript/flavours/glitch/features/onboarding/profile.tsx
+++ b/app/javascript/flavours/glitch/features/onboarding/profile.tsx
@@ -3,9 +3,10 @@ import { useState, useMemo, useCallback, createRef } from 'react';
 import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
-import { Helmet } from 'react-helmet';
 import { useHistory } from 'react-router-dom';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import AddPhotoAlternateIcon from '@/material-icons/400-24px/add_photo_alternate.svg?react';
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import PersonIcon from '@/material-icons/400-24px/person.svg?react';
diff --git a/app/javascript/flavours/glitch/features/pinned_statuses/index.jsx b/app/javascript/flavours/glitch/features/pinned_statuses/index.jsx
index b32c9e7ba9..b505afe2d0 100644
--- a/app/javascript/flavours/glitch/features/pinned_statuses/index.jsx
+++ b/app/javascript/flavours/glitch/features/pinned_statuses/index.jsx
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 
 import { defineMessages } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
diff --git a/app/javascript/flavours/glitch/features/privacy_policy/index.tsx b/app/javascript/flavours/glitch/features/privacy_policy/index.tsx
index 400cc92d8e..a055594a9b 100644
--- a/app/javascript/flavours/glitch/features/privacy_policy/index.tsx
+++ b/app/javascript/flavours/glitch/features/privacy_policy/index.tsx
@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react';
 
 import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import { apiGetPrivacyPolicy } from 'flavours/glitch/api/instance';
 import type { ApiPrivacyPolicyJSON } from 'flavours/glitch/api_types/instance';
diff --git a/app/javascript/flavours/glitch/features/public_timeline/index.jsx b/app/javascript/flavours/glitch/features/public_timeline/index.jsx
index 7e028b0e53..d4063b4aa3 100644
--- a/app/javascript/flavours/glitch/features/public_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/public_timeline/index.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { defineMessages, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import { connect } from 'react-redux';
 
diff --git a/app/javascript/flavours/glitch/features/quotes/index.tsx b/app/javascript/flavours/glitch/features/quotes/index.tsx
index 6990266a61..f815d4a054 100644
--- a/app/javascript/flavours/glitch/features/quotes/index.tsx
+++ b/app/javascript/flavours/glitch/features/quotes/index.tsx
@@ -2,10 +2,10 @@ import { useCallback, useEffect } from 'react';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
-
 import { List as ImmutableList } from 'immutable';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
 import { fetchQuotes } from 'flavours/glitch/actions/interactions_typed';
 import { ColumnHeader } from 'flavours/glitch/components/column_header';
diff --git a/app/javascript/flavours/glitch/features/reblogs/index.jsx b/app/javascript/flavours/glitch/features/reblogs/index.jsx
index ac9b5950be..e1b5eadbc0 100644
--- a/app/javascript/flavours/glitch/features/reblogs/index.jsx
+++ b/app/javascript/flavours/glitch/features/reblogs/index.jsx
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 
 import { defineMessages, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
diff --git a/app/javascript/flavours/glitch/features/search/index.tsx b/app/javascript/flavours/glitch/features/search/index.tsx
index b7ba59e93f..28252e5250 100644
--- a/app/javascript/flavours/glitch/features/search/index.tsx
+++ b/app/javascript/flavours/glitch/features/search/index.tsx
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef } from 'react';
 
 import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index 2974328a84..7bf1f9466e 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { defineMessages } from 'react-intl';
 
 import classNames from 'classnames';
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 import { withRouter } from 'react-router-dom';
 import { difference } from 'lodash';
 
diff --git a/app/javascript/flavours/glitch/features/terms_of_service/index.tsx b/app/javascript/flavours/glitch/features/terms_of_service/index.tsx
index 0b566ed7bd..bc5a15e0bb 100644
--- a/app/javascript/flavours/glitch/features/terms_of_service/index.tsx
+++ b/app/javascript/flavours/glitch/features/terms_of_service/index.tsx
@@ -7,9 +7,10 @@ import {
   defineMessages,
 } from 'react-intl';
 
-import { Helmet } from 'react-helmet';
 import { Link, useParams } from 'react-router-dom';
 
+import { Helmet } from '@unhead/react/helmet';
+
 import { apiGetTermsOfService } from 'flavours/glitch/api/instance';
 import type { ApiTermsOfServiceJSON } from 'flavours/glitch/api_types/instance';
 import { Column } from 'flavours/glitch/components/column';
diff --git a/app/javascript/flavours/glitch/features/ui/components/bundle_column_error.jsx b/app/javascript/flavours/glitch/features/ui/components/bundle_column_error.jsx
index a76d9fdfdd..6fd5d1ebca 100644
--- a/app/javascript/flavours/glitch/features/ui/components/bundle_column_error.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/bundle_column_error.jsx
@@ -4,7 +4,7 @@ import { PureComponent } from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 import { Link } from 'react-router-dom';
 
 import { Button } from 'flavours/glitch/components/button';
diff --git a/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx b/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
index 79f41da604..32b487dc22 100644
--- a/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { Helmet } from 'react-helmet';
+import { Helmet } from '@unhead/react/helmet';
 
 import Base from 'flavours/glitch/components/modal_root';
 import { AltTextModal } from 'flavours/glitch/features/alt_text_modal';