diff --git a/components/SidebarNav.tsx b/components/SidebarNav.tsx
index 1c95af0509..86e917ddaf 100644
--- a/components/SidebarNav.tsx
+++ b/components/SidebarNav.tsx
@@ -10,7 +10,7 @@ import { useVersion } from './hooks/useVersion'
 
 export const SidebarNav = () => {
   const router = useRouter()
-  const { error, relativePath, isHomepageVersion } = useMainContext()
+  const { error, relativePath } = useMainContext()
   const { t } = useTranslation('header')
 
   return (
@@ -39,7 +39,7 @@ export const SidebarNav = () => {
       <nav>
         {error === '404' || relativePath === 'index.md' ? (
           <ul className="sidebar-products mt-4">
-            {!isHomepageVersion && <AllProductsLink />}
+            {<AllProductsLink />}
             <SidebarHomepage />
           </ul>
         ) : (
@@ -66,12 +66,12 @@ export const SidebarNav = () => {
 const SidebarHomepage = () => {
   const router = useRouter()
   const { currentVersion } = useVersion()
-  const { activeProducts, isHomepageVersion } = useMainContext()
+  const { activeProducts } = useMainContext()
 
   return (
     <>
       {activeProducts.map((product) => {
-        if (!product.versions?.includes(currentVersion) && !isHomepageVersion) {
+        if (!product.versions?.includes(currentVersion) && !product.external) {
           return null
         }
 
diff --git a/components/article/ArticleVersionPicker.tsx b/components/article/ArticleVersionPicker.tsx
index 989fd4d745..9d10332f2c 100644
--- a/components/article/ArticleVersionPicker.tsx
+++ b/components/article/ArticleVersionPicker.tsx
@@ -31,10 +31,6 @@ export const ArticleVersionPicker = () => {
       </summary>
       <Dropdown.Menu direction="sw">
         {(page.permalinks || []).map((permalink) => {
-          if (permalink.pageVersion === 'homepage') {
-            return null
-          }
-
           return (
             <Dropdown.Item key={permalink.href}>
               <Link href={permalink.href}>{permalink.pageVersionTitle}</Link>
diff --git a/components/context/MainContext.tsx b/components/context/MainContext.tsx
index 0a624b0ccf..7fef5de9c6 100644
--- a/components/context/MainContext.tsx
+++ b/components/context/MainContext.tsx
@@ -115,7 +115,7 @@ export const getMainContextFromRequest = (req: any): MainContextT => {
     activeProducts: req.context.activeProducts,
     currentProduct: req.context.productMap[req.context.currentProduct] || null,
     currentLayoutName: req.context.currentLayoutName,
-    isHomepageVersion: req.context.currentVersion === 'homepage',
+    isHomepageVersion: req.context.page?.documentType === 'homepage',
     error: req.context.error ? req.context.error.toString() : '',
     data: {
       ui: req.context.site.data.ui,
diff --git a/components/landing/HomepageVersionPicker.tsx b/components/landing/HomepageVersionPicker.tsx
index a2b68043af..8171a7001f 100644
--- a/components/landing/HomepageVersionPicker.tsx
+++ b/components/landing/HomepageVersionPicker.tsx
@@ -6,7 +6,6 @@ import { ChevronDownIcon } from '@primer/octicons-react'
 import { Link } from 'components/Link'
 import { useMainContext } from 'components/context/MainContext'
 import { useVersion } from 'components/hooks/useVersion'
-import { useTranslation } from 'components/hooks/useTranslation'
 
 type Props = {
   variant?: 'inline'
@@ -15,14 +14,13 @@ export const HomepageVersionPicker = ({ variant }: Props) => {
   const router = useRouter()
   const { currentVersion } = useVersion()
   const { getDetailsProps } = useDetails({})
-  const { allVersions, page, enterpriseServerVersions, isHomepageVersion } = useMainContext()
-  const { t } = useTranslation('homepage')
+  const { allVersions, page, enterpriseServerVersions } = useMainContext()
 
   if (page.permalinks && page.permalinks.length <= 1) {
     return null
   }
 
-  const label = isHomepageVersion ? t('version_picker') : allVersions[currentVersion].versionTitle
+  const label = allVersions[currentVersion].versionTitle
 
   if (variant === 'inline') {
     return (
@@ -35,9 +33,6 @@ export const HomepageVersionPicker = ({ variant }: Props) => {
         </summary>
         <div>
           {(page.permalinks || []).map((permalink) => {
-            if (permalink.pageVersion === 'homepage') {
-              return null
-            }
             return (
               <Link
                 key={permalink.href}
@@ -78,10 +73,6 @@ export const HomepageVersionPicker = ({ variant }: Props) => {
       </summary>
       <Dropdown.Menu direction="sw">
         {(page.permalinks || []).map((permalink) => {
-          if (permalink.pageVersion === 'homepage') {
-            return null
-          }
-
           return (
             <Dropdown.Item key={permalink.href}>
               <Link href={permalink.href}>{permalink.pageVersionTitle}</Link>
diff --git a/pages/index.tsx b/pages/index.tsx
index 2e6d466d1f..f129a0c682 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -44,7 +44,7 @@ type LandingPageProps = {
 function LandingPage(props: LandingPageProps) {
   const router = useRouter()
   const { gettingStartedLinks, popularLinks } = props
-  const { activeProducts, isHomepageVersion } = useMainContext()
+  const { activeProducts } = useMainContext()
   const { currentVersion } = useVersion()
   const { t } = useTranslation(['homepage', 'search', 'toc'])
   return (
@@ -80,7 +80,7 @@ function LandingPage(props: LandingPageProps) {
           </h2>
           <div className="d-flex flex-wrap gutter gutter-xl-spacious">
             {activeProducts.map((product) => {
-              if (!product.versions?.includes(currentVersion) && !isHomepageVersion) {
+              if (!product.versions?.includes(currentVersion) && !product.external) {
                 return null
               }