diff --git a/src/app/[orgId]/settings/(private)/remote-exit-nodes/page.tsx b/src/app/[orgId]/settings/(private)/remote-exit-nodes/page.tsx
index ff444c6f1..a870545b8 100644
--- a/src/app/[orgId]/settings/(private)/remote-exit-nodes/page.tsx
+++ b/src/app/[orgId]/settings/(private)/remote-exit-nodes/page.tsx
@@ -10,6 +10,7 @@ import { getTranslations } from "next-intl/server";
 import type { Metadata } from "next";
 import { build } from "@server/build";
 import { redirect } from "next/navigation";
+import { useEnvContext } from "@app/hooks/useEnvContext";
 
 export const metadata: Metadata = {
     title: "Remote Exit Nodes"
@@ -24,7 +25,9 @@ export const dynamic = "force-dynamic";
 export default async function RemoteExitNodesPage(
     props: RemoteExitNodesPageProps
 ) {
-    if (build != "saas") {
+    const { env } = useEnvContext();
+
+    if (!env?.flags.usePangolinDns) {
         redirect("/");
     }
 
diff --git a/src/app/navigation.tsx b/src/app/navigation.tsx
index 80352bca8..85a01e37d 100644
--- a/src/app/navigation.tsx
+++ b/src/app/navigation.tsx
@@ -140,7 +140,7 @@ export const orgNavSections = (
                 href: "/{orgId}/settings/domains",
                 icon: <Globe className="size-4 flex-none" />
             },
-            ...(build === "saas"
+            ...(env?.flags.usePangolinDns
                 ? [
                       {
                           title: "sidebarRemoteExitNodes",
@@ -461,7 +461,7 @@ export const commandBarNavSections = (
                 title: "commandMachineClients",
                 icon: <Server className="size-4 flex-none" />
             },
-            ...(build === "saas"
+            ...(env?.flags.usePangolinDns
                 ? [
                       {
                           title: "commandRemoteExitNodes",