diff --git a/src/components/CreateDomainForm.tsx b/src/components/CreateDomainForm.tsx
index 38a4549c..258aee49 100644
--- a/src/components/CreateDomainForm.tsx
+++ b/src/components/CreateDomainForm.tsx
@@ -125,7 +125,7 @@ export default function CreateDomainForm({
         resolver: zodResolver(formSchema),
         defaultValues: {
             baseDomain: "",
-            type: build == "oss" ? "wildcard" : "ns"
+            type: build == "oss" || !env.flags.usePangolinDns ? "wildcard" : "ns"
         }
     });
 
diff --git a/src/components/LicenseKeysDataTable.tsx b/src/components/LicenseKeysDataTable.tsx
index 71b15681..9c4750b4 100644
--- a/src/components/LicenseKeysDataTable.tsx
+++ b/src/components/LicenseKeysDataTable.tsx
@@ -80,7 +80,7 @@ export function LicenseKeysDataTable({
             }
         },
         {
-            accessorKey: "type",
+            accessorKey: "tier",
             header: ({ column }) => {
                 return (
                     <Button