diff --git a/packages/shared/src/components/tooltips/Portal.tsx b/packages/shared/src/components/tooltips/Portal.tsx
index e48cfb1b170..b3c68b66a9e 100644
--- a/packages/shared/src/components/tooltips/Portal.tsx
+++ b/packages/shared/src/components/tooltips/Portal.tsx
@@ -6,13 +6,13 @@ import { getCompanionWrapper } from '../../lib/extension';
 
 interface PortalProps {
   children: ReactNode;
-  container: Element;
+  container: Element | null;
 }
 
 export const Portal = ({
   children,
   container,
-}: PortalProps): ReturnType<typeof createPortal> => {
+}: PortalProps): ReturnType<typeof createPortal> | null => {
   if (!container) {
     return null;
   }
diff --git a/packages/webapp/pages/bookmarks/[folderId].tsx b/packages/webapp/pages/bookmarks/[folderId].tsx
index 6947d638c59..beda799cd2d 100644
--- a/packages/webapp/pages/bookmarks/[folderId].tsx
+++ b/packages/webapp/pages/bookmarks/[folderId].tsx
@@ -17,7 +17,7 @@ const seo: NextSeoProps = {
   ...defaultSeo,
 };
 
-const BookmarksPage = (): ReactElement => {
+const BookmarksPage = (): ReactElement | null => {
   const router = useRouter();
   const { isAuthReady } = useAuthContext();
   const { isPlus } = usePlusSubscription();
diff --git a/packages/webapp/pages/feeds/[slugOrId]/edit.tsx b/packages/webapp/pages/feeds/[slugOrId]/edit.tsx
index 7f80ef00076..2abe1bf8a6e 100644
--- a/packages/webapp/pages/feeds/[slugOrId]/edit.tsx
+++ b/packages/webapp/pages/feeds/[slugOrId]/edit.tsx
@@ -22,7 +22,7 @@ const seo: NextSeoProps = {
   ...defaultSeo,
 };
 
-const EditFeedPage = (): ReactElement => {
+const EditFeedPage = (): ReactElement | null => {
   const router = useRouter();
   const { FeedPageLayoutComponent } = useFeedLayout();
   const feedSlugOrId = router.query.slugOrId as string;
diff --git a/packages/webapp/pages/history.tsx b/packages/webapp/pages/history.tsx
index 7a4006d6f24..5d3b595d554 100644
--- a/packages/webapp/pages/history.tsx
+++ b/packages/webapp/pages/history.tsx
@@ -9,7 +9,7 @@ import ProtectedPage from '../components/ProtectedPage';
 import { getLayout } from '../components/layouts/MainLayout';
 import { getLayout as getFooterNavBarLayout } from '../components/layouts/FooterNavBarLayout';
 
-const History = (): ReactElement => {
+const History = (): ReactElement | null => {
   const isLaptop = useViewSize(ViewSize.Laptop);
   const router = useRouter();
 
diff --git a/packages/webapp/pages/jobs/index.tsx b/packages/webapp/pages/jobs/index.tsx
index b8a6910a48b..0fa4cf61cd4 100644
--- a/packages/webapp/pages/jobs/index.tsx
+++ b/packages/webapp/pages/jobs/index.tsx
@@ -26,7 +26,7 @@ const activeStatuses = [
   OpportunityMatchStatus.CandidateAccepted,
 ];
 
-const JobsPage = (): ReactElement => {
+const JobsPage = (): ReactElement | null => {
   const { checkHasCompleted, isActionsFetched, completeAction } = useActions();
   const { sidebarRendered } = useSidebarRendered();
   const hasUploadedCV = checkHasCompleted(ActionType.UploadedCV);
diff --git a/packages/webapp/pages/plus/index.tsx b/packages/webapp/pages/plus/index.tsx
index e34a8a0d014..5835ee58849 100644
--- a/packages/webapp/pages/plus/index.tsx
+++ b/packages/webapp/pages/plus/index.tsx
@@ -54,7 +54,7 @@ export type PlusPageProps = Pick<GiftUserContextData, 'giftToUser'> &
 const PlusPage = ({
   giftToUser,
   shouldShowPlusHeader,
-}: PlusPageProps): ReactElement => {
+}: PlusPageProps): ReactElement | null => {
   const { logEvent } = useLogContext();
   const { isReady } = useRouter();
   const isLaptop = useViewSize(ViewSize.Laptop);
diff --git a/packages/webapp/pages/recruiter/review/[id].tsx b/packages/webapp/pages/recruiter/review/[id].tsx
index 11cafd3b924..db91869c311 100644
--- a/packages/webapp/pages/recruiter/review/[id].tsx
+++ b/packages/webapp/pages/recruiter/review/[id].tsx
@@ -78,7 +78,7 @@ const ContentSection = ({
   );
 };
 
-const ReviewDetailPage = (): ReactElement => {
+const ReviewDetailPage = (): ReactElement | null => {
   const router = useRouter();
   const { id } = router.query;
   const { user, isAuthReady } = useAuthContext();
diff --git a/packages/webapp/pages/recruiter/review/index.tsx b/packages/webapp/pages/recruiter/review/index.tsx
index 83ff3ca53b2..08ef04702a6 100644
--- a/packages/webapp/pages/recruiter/review/index.tsx
+++ b/packages/webapp/pages/recruiter/review/index.tsx
@@ -75,7 +75,7 @@ const OpportunityCard = ({
   );
 };
 
-const ReviewListPage = (): ReactElement => {
+const ReviewListPage = (): ReactElement | null => {
   const router = useRouter();
   const { user, isAuthReady } = useAuthContext();