diff --git a/web/app.react.js b/web/app.react.js
--- a/web/app.react.js
+++ b/web/app.react.js
@@ -52,6 +52,7 @@
 import Chat from './chat/chat.react.js';
 import { EditModalProvider } from './chat/edit-message-provider.js';
 import { MemberListSidebarProvider } from './chat/member-list-sidebar/member-list-sidebar-provider.react.js';
+import { AutoJoinCommunityHandler } from './components/auto-join-community-handler.react.js';
 import CommunitiesRefresher from './components/communities-refresher.react.js';
 import { DBOpsHandler } from './components/db-ops-handler.react.js';
 import LogOutIfMissingCSATHandler from './components/log-out-if-missing-csat-handler.react.js';
@@ -252,6 +253,7 @@
                       <UserInfosHandler />
                       <TunnelbrokerDeviceTokenHandler />
                       <FarcasterDataHandler />
+                      <AutoJoinCommunityHandler />
                       {content}
                     </ChatMentionContextProvider>
                   </MessageSearchStateProvider>
diff --git a/web/components/auto-join-community-handler.react.js b/web/components/auto-join-community-handler.react.js
new file mode 100644
--- /dev/null
+++ b/web/components/auto-join-community-handler.react.js
@@ -0,0 +1,16 @@
+// @flow
+
+import * as React from 'react';
+
+import { BaseAutoJoinCommunityHandler } from 'lib/components/base-auto-join-community-handler.react.js';
+
+import { useSelector } from '../redux/redux-utils.js';
+import { nonThreadCalendarQuery } from '../selectors/nav-selectors.js';
+
+function AutoJoinCommunityHandler(): React.Node {
+  const calendarQuery = useSelector(nonThreadCalendarQuery);
+
+  return <BaseAutoJoinCommunityHandler calendarQuery={calendarQuery} />;
+}
+
+export { AutoJoinCommunityHandler };