diff --git a/studio/components/interfaces/Organization/BillingSettingsV2/TaxID/TaxID.tsx b/studio/components/interfaces/Organization/BillingSettingsV2/TaxID/TaxID.tsx
index a18a716e5bc..6f1a45e2baf 100644
--- a/studio/components/interfaces/Organization/BillingSettingsV2/TaxID/TaxID.tsx
+++ b/studio/components/interfaces/Organization/BillingSettingsV2/TaxID/TaxID.tsx
@@ -188,7 +188,7 @@ const TaxID = () => {
                           <div className="w-full space-y-2">
                             {taxIdValues.map((taxId, idx: number) => {
                               const selectedTaxId = TAX_IDS.find(
-                                (option) => option.code === taxId.type
+                                (option) => option.name === taxId.name
                               )
                               return (
                                 <div key={`tax-id-${idx}`} className="flex items-center space-x-2">
diff --git a/studio/components/interfaces/Organization/BillingSettingsV2/TaxID/TaxID.utilts.ts b/studio/components/interfaces/Organization/BillingSettingsV2/TaxID/TaxID.utilts.ts
index 825fd7a487d..a7a8b935ce7 100644
--- a/studio/components/interfaces/Organization/BillingSettingsV2/TaxID/TaxID.utilts.ts
+++ b/studio/components/interfaces/Organization/BillingSettingsV2/TaxID/TaxID.utilts.ts
@@ -2,16 +2,10 @@ import { TaxIdValue } from 'data/organizations/organization-tax-ids-update-mutat
 import { TAX_IDS } from './TaxID.constants'
 import { isEqual, sortBy } from 'lodash'
 
-/**
- * Sanitize EU VAT ids so they get prepended with the country code
- *
- * Ex: Belgium's VAT ID should be BE0123456789 not 0123456789
- * Only EU VAT ids are affected
- */
 export const sanitizeTaxID = (taxId: TaxIdValue) => {
   let newID = taxId
 
-  const selectedTaxId = TAX_IDS.find((option) => option.code === taxId.type)
+  const selectedTaxId = TAX_IDS.find((option) => option.name === taxId.name)
 
   const vatIdPrefix = selectedTaxId?.vatPrefix