diff --git a/src/components/DNSRecordTable.tsx b/src/components/DNSRecordTable.tsx
index 37fa66c0..8c8f6bb4 100644
--- a/src/components/DNSRecordTable.tsx
+++ b/src/components/DNSRecordTable.tsx
@@ -5,6 +5,7 @@ import { useTranslations } from "next-intl";
 import { Badge } from "@app/components/ui/badge";
 import { DNSRecordsDataTable } from "./DNSRecordsDataTable";
 import CopyToClipboard from "@app/components/CopyToClipboard";
+import { useEnvContext } from "@app/hooks/useEnvContext";
 
 export type DNSRecordRow = {
     id: string;
@@ -24,6 +25,30 @@ export default function DNSRecordsTable({
     type
 }: Props) {
     const t = useTranslations();
+    const env = useEnvContext();
+
+    const statusColumn: ColumnDef<DNSRecordRow> = {
+        accessorKey: "verified",
+        header: ({ column }) => {
+            return <div>{t("status")}</div>;
+        },
+        cell: ({ row }) => {
+            const verified = row.original.verified;
+            return verified ? (
+                type === "wildcard" ? (
+                    <Badge variant="outlinePrimary">
+                        {t("manual", { fallback: "Manual" })}
+                    </Badge>
+                ) : (
+                    <Badge variant="green">{t("verified")}</Badge>
+                )
+            ) : (
+                <Badge variant="yellow">
+                    {t("pending", { fallback: "Pending" })}
+                </Badge>
+            );
+        }
+    };
 
     const columns: ColumnDef<DNSRecordRow>[] = [
         {
@@ -81,28 +106,7 @@ export default function DNSRecordsTable({
                 );
             }
         },
-        {
-            accessorKey: "verified",
-            header: ({ column }) => {
-                return <div>{t("status")}</div>;
-            },
-            cell: ({ row }) => {
-                const verified = row.original.verified;
-                return verified ? (
-                    type === "wildcard" ? (
-                        <Badge variant="outlinePrimary">
-                            {t("manual", { fallback: "Manual" })}
-                        </Badge>
-                    ) : (
-                        <Badge variant="green">{t("verified")}</Badge>
-                    )
-                ) : (
-                    <Badge variant="yellow">
-                        {t("pending", { fallback: "Pending" })}
-                    </Badge>
-                );
-            }
-        }
+        ...(env.env.flags.usePangolinDns ? [statusColumn] : [])
     ];
 
     return (
diff --git a/src/components/DomainInfoCard.tsx b/src/components/DomainInfoCard.tsx
index b5de6cd3..e33998da 100644
--- a/src/components/DomainInfoCard.tsx
+++ b/src/components/DomainInfoCard.tsx
@@ -9,6 +9,7 @@ import {
 } from "@app/components/InfoSection";
 import { useTranslations } from "next-intl";
 import { Badge } from "./ui/badge";
+import { useEnvContext } from "@app/hooks/useEnvContext";
 
 type DomainInfoCardProps = {
     failed: boolean;
@@ -22,6 +23,7 @@ export default function DomainInfoCard({
     type
 }: DomainInfoCardProps) {
     const t = useTranslations();
+    const env = useEnvContext();
 
     const getTypeDisplay = (type: string) => {
         switch (type) {
@@ -46,32 +48,34 @@ export default function DomainInfoCard({
                             <span>{getTypeDisplay(type ? type : "")}</span>
                         </InfoSectionContent>
                     </InfoSection>
-                    <InfoSection>
-                        <InfoSectionTitle>{t("status")}</InfoSectionTitle>
-                        <InfoSectionContent>
-                            {failed ? (
-                                <Badge variant="red">
-                                    {t("failed", { fallback: "Failed" })}
-                                </Badge>
-                            ) : verified ? (
-                                type === "wildcard" ? (
-                                    <Badge variant="outlinePrimary">
-                                        {t("manual", {
-                                            fallback: "Manual"
-                                        })}
+                    {env.env.flags.usePangolinDns && (
+                        <InfoSection>
+                            <InfoSectionTitle>{t("status")}</InfoSectionTitle>
+                            <InfoSectionContent>
+                                {failed ? (
+                                    <Badge variant="red">
+                                        {t("failed", { fallback: "Failed" })}
                                     </Badge>
+                                ) : verified ? (
+                                    type === "wildcard" ? (
+                                        <Badge variant="outlinePrimary">
+                                            {t("manual", {
+                                                fallback: "Manual"
+                                            })}
+                                        </Badge>
+                                    ) : (
+                                        <Badge variant="green">
+                                            {t("verified")}
+                                        </Badge>
+                                    )
                                 ) : (
-                                    <Badge variant="green">
-                                        {t("verified")}
+                                    <Badge variant="yellow">
+                                        {t("pending", { fallback: "Pending" })}
                                     </Badge>
-                                )
-                            ) : (
-                                <Badge variant="yellow">
-                                    {t("pending", { fallback: "Pending" })}
-                                </Badge>
-                            )}
-                        </InfoSectionContent>
-                    </InfoSection>
+                                )}
+                            </InfoSectionContent>
+                        </InfoSection>
+                    )}
                 </InfoSections>
             </AlertDescription>
         </Alert>
diff --git a/src/components/DomainsTable.tsx b/src/components/DomainsTable.tsx
index 3e12bab5..a099a8b8 100644
--- a/src/components/DomainsTable.tsx
+++ b/src/components/DomainsTable.tsx
@@ -55,7 +55,8 @@ export default function DomainsTable({ domains, orgId }: Props) {
     const [restartingDomains, setRestartingDomains] = useState<Set<string>>(
         new Set()
     );
-    const api = createApiClient(useEnvContext());
+    const env = useEnvContext();
+    const api = createApiClient(env);
     const router = useRouter();
     const t = useTranslations();
     const { toast } = useToast();
@@ -134,6 +135,41 @@ export default function DomainsTable({ domains, orgId }: Props) {
         }
     };
 
+    const statusColumn: ColumnDef<DomainRow> = {
+        accessorKey: "verified",
+        header: ({ column }) => {
+            return (
+                <Button
+                    variant="ghost"
+                    onClick={() =>
+                        column.toggleSorting(column.getIsSorted() === "asc")
+                    }
+                >
+                    {t("status")}
+                    <ArrowUpDown className="ml-2 h-4 w-4" />
+                </Button>
+            );
+        },
+        cell: ({ row }) => {
+            const { verified, failed, type } = row.original;
+            if (verified) {
+                return type == "wildcard" ? (
+                    <Badge variant="outlinePrimary">{t("manual")}</Badge>
+                ) : (
+                    <Badge variant="green">{t("verified")}</Badge>
+                );
+            } else if (failed) {
+                return (
+                    <Badge variant="red">
+                        {t("failed", { fallback: "Failed" })}
+                    </Badge>
+                );
+            } else {
+                return <Badge variant="yellow">{t("pending")}</Badge>;
+            }
+        }
+    };
+
     const columns: ColumnDef<DomainRow>[] = [
         {
             accessorKey: "baseDomain",
@@ -173,40 +209,7 @@ export default function DomainsTable({ domains, orgId }: Props) {
                 );
             }
         },
-        {
-            accessorKey: "verified",
-            header: ({ column }) => {
-                return (
-                    <Button
-                        variant="ghost"
-                        onClick={() =>
-                            column.toggleSorting(column.getIsSorted() === "asc")
-                        }
-                    >
-                        {t("status")}
-                        <ArrowUpDown className="ml-2 h-4 w-4" />
-                    </Button>
-                );
-            },
-            cell: ({ row }) => {
-                const { verified, failed, type } = row.original;
-                if (verified) {
-                    return type == "wildcard" ? (
-                        <Badge variant="outlinePrimary">{t("manual")}</Badge>
-                    ) : (
-                        <Badge variant="green">{t("verified")}</Badge>
-                    );
-                } else if (failed) {
-                    return (
-                        <Badge variant="red">
-                            {t("failed", { fallback: "Failed" })}
-                        </Badge>
-                    );
-                } else {
-                    return <Badge variant="yellow">{t("pending")}</Badge>;
-                }
-            }
-        },
+        ...(env.env.flags.usePangolinDns ? [statusColumn] : []),
         {
             id: "actions",
             cell: ({ row }) => {