diff --git a/packages/services/api/src/modules/billing/module.graphql.ts b/packages/services/api/src/modules/billing/module.graphql.ts
index acce98e80..c80b9ebe7 100644
--- a/packages/services/api/src/modules/billing/module.graphql.ts
+++ b/packages/services/api/src/modules/billing/module.graphql.ts
@@ -35,7 +35,7 @@ export default gql`
     country: String
     line1: String
     line2: String
-    postalCode: Int
+    postalCode: String
     state: String
   }
 
diff --git a/packages/services/api/src/modules/billing/resolvers.ts b/packages/services/api/src/modules/billing/resolvers.ts
index b4b2002b3..bbfe24b52 100644
--- a/packages/services/api/src/modules/billing/resolvers.ts
+++ b/packages/services/api/src/modules/billing/resolvers.ts
@@ -94,7 +94,7 @@ export const resolvers: BillingModule.Resolvers = {
     country: bd => bd.address?.country || null,
     line1: bd => bd.address?.line1 || null,
     line2: bd => bd.address?.line2 || null,
-    postalCode: bd => (bd.address?.postal_code ? parseInt(bd.address?.postal_code) : null),
+    postalCode: bd => bd.address?.postal_code ?? null,
     state: bd => bd.address?.state || null,
   },
   Query: {
diff --git a/packages/web/app/src/graphql/fragments.graphql b/packages/web/app/src/graphql/fragments.graphql
index fde518c72..825eb6306 100644
--- a/packages/web/app/src/graphql/fragments.graphql
+++ b/packages/web/app/src/graphql/fragments.graphql
@@ -419,21 +419,12 @@ fragment OrgBillingInfoFields on Organization {
   plan
   ...OrgRateLimitFields
   billingConfiguration {
-    hasActiveSubscription
     paymentMethod {
       brand
       last4
       expMonth
       expYear
     }
-    billingAddress {
-      city
-      country
-      line1
-      line2
-      postalCode
-      state
-    }
     invoices {
       ...BillingInvoiceFields
     }