diff --git a/src/components/settings/integrations/NetsuiteIntegrationItemsList.tsx b/src/components/settings/integrations/NetsuiteIntegrationItemsList.tsx
index be6f67465..973fac09d 100644
--- a/src/components/settings/integrations/NetsuiteIntegrationItemsList.tsx
+++ b/src/components/settings/integrations/NetsuiteIntegrationItemsList.tsx
@@ -50,7 +50,13 @@ gql`
     }
   }
 
-  query getAddOnsForNetsuiteItemsList($page: Int, $limit: Int, $searchTerm: String) {
+  query getAddOnsForNetsuiteItemsList(
+    $page: Int
+    $limit: Int
+    $searchTerm: String
+    # integrationId used in item list fragment
+    $integrationId: ID!
+  ) {
     addOns(page: $page, limit: $limit, searchTerm: $searchTerm) {
       metadata {
         currentPage
@@ -63,7 +69,13 @@ gql`
     }
   }
 
-  query getBillableMetricsForNetsuiteItemsList($page: Int, $limit: Int, $searchTerm: String) {
+  query getBillableMetricsForNetsuiteItemsList(
+    $page: Int
+    $limit: Int
+    $searchTerm: String
+    # integrationId used in item list fragment
+    $integrationId: ID!
+  ) {
     billableMetrics(page: $page, limit: $limit, searchTerm: $searchTerm) {
       metadata {
         currentPage
@@ -121,6 +133,7 @@ const NetsuiteIntegrationItemsList = ({ integrationId }: { integrationId: string
     notifyOnNetworkStatusChange: true,
     variables: {
       limit: 20,
+      integrationId,
     },
   })
 
@@ -137,6 +150,7 @@ const NetsuiteIntegrationItemsList = ({ integrationId }: { integrationId: string
     notifyOnNetworkStatusChange: true,
     variables: {
       limit: 20,
+      integrationId,
     },
   })
 
diff --git a/src/components/settings/integrations/NetsuiteIntegrationItemsListAddons.tsx b/src/components/settings/integrations/NetsuiteIntegrationItemsListAddons.tsx
index 7a0535a0a..8fe04a9b4 100644
--- a/src/components/settings/integrations/NetsuiteIntegrationItemsListAddons.tsx
+++ b/src/components/settings/integrations/NetsuiteIntegrationItemsListAddons.tsx
@@ -24,7 +24,7 @@ gql`
     id
     name
     code
-    integrationMappings {
+    integrationMappings(integrationId: $integrationId) {
       id
       externalId
       externalAccountCode
diff --git a/src/components/settings/integrations/NetsuiteIntegrationItemsListBillableMetrics.tsx b/src/components/settings/integrations/NetsuiteIntegrationItemsListBillableMetrics.tsx
index 225cf271a..31d9248ef 100644
--- a/src/components/settings/integrations/NetsuiteIntegrationItemsListBillableMetrics.tsx
+++ b/src/components/settings/integrations/NetsuiteIntegrationItemsListBillableMetrics.tsx
@@ -24,7 +24,7 @@ gql`
     id
     name
     code
-    integrationMappings {
+    integrationMappings(integrationId: $integrationId) {
       id
       externalId
       externalAccountCode
diff --git a/src/generated/graphql.tsx b/src/generated/graphql.tsx
index 794ee08e9..66efb5046 100644
--- a/src/generated/graphql.tsx
+++ b/src/generated/graphql.tsx
@@ -79,6 +79,11 @@ export type AddOn = {
   updatedAt: Scalars['ISO8601DateTime']['output'];
 };
 
+
+export type AddOnIntegrationMappingsArgs = {
+  integrationId?: InputMaybe<Scalars['ID']['input']>;
+};
+
 export type AddOnCollection = {
   __typename?: 'AddOnCollection';
   collection: Array<AddOn>;
@@ -192,6 +197,12 @@ export type BillableMetric = {
   weightedInterval?: Maybe<WeightedIntervalEnum>;
 };
 
+
+/** Base billable metric */
+export type BillableMetricIntegrationMappingsArgs = {
+  integrationId?: InputMaybe<Scalars['ID']['input']>;
+};
+
 export type BillableMetricCollection = {
   __typename?: 'BillableMetricCollection';
   collection: Array<BillableMetric>;
@@ -5856,6 +5867,7 @@ export type GetAddOnsForNetsuiteItemsListQueryVariables = Exact<{
   page?: InputMaybe<Scalars['Int']['input']>;
   limit?: InputMaybe<Scalars['Int']['input']>;
   searchTerm?: InputMaybe<Scalars['String']['input']>;
+  integrationId: Scalars['ID']['input'];
 }>;
 
 
@@ -5865,6 +5877,7 @@ export type GetBillableMetricsForNetsuiteItemsListQueryVariables = Exact<{
   page?: InputMaybe<Scalars['Int']['input']>;
   limit?: InputMaybe<Scalars['Int']['input']>;
   searchTerm?: InputMaybe<Scalars['String']['input']>;
+  integrationId: Scalars['ID']['input'];
 }>;
 
 
@@ -7487,7 +7500,7 @@ export const NetsuiteIntegrationItemsListAddonsFragmentDoc = gql`
   id
   name
   code
-  integrationMappings {
+  integrationMappings(integrationId: $integrationId) {
     id
     externalId
     externalAccountCode
@@ -7501,7 +7514,7 @@ export const NetsuiteIntegrationItemsListBillableMetricsFragmentDoc = gql`
   id
   name
   code
-  integrationMappings {
+  integrationMappings(integrationId: $integrationId) {
     id
     externalId
     externalAccountCode
@@ -13098,7 +13111,7 @@ export type GetIntegrationCollectionMappingsLazyQueryHookResult = ReturnType<typ
 export type GetIntegrationCollectionMappingsSuspenseQueryHookResult = ReturnType<typeof useGetIntegrationCollectionMappingsSuspenseQuery>;
 export type GetIntegrationCollectionMappingsQueryResult = Apollo.QueryResult<GetIntegrationCollectionMappingsQuery, GetIntegrationCollectionMappingsQueryVariables>;
 export const GetAddOnsForNetsuiteItemsListDocument = gql`
-    query getAddOnsForNetsuiteItemsList($page: Int, $limit: Int, $searchTerm: String) {
+    query getAddOnsForNetsuiteItemsList($page: Int, $limit: Int, $searchTerm: String, $integrationId: ID!) {
   addOns(page: $page, limit: $limit, searchTerm: $searchTerm) {
     metadata {
       currentPage
@@ -13127,10 +13140,11 @@ export const GetAddOnsForNetsuiteItemsListDocument = gql`
  *      page: // value for 'page'
  *      limit: // value for 'limit'
  *      searchTerm: // value for 'searchTerm'
+ *      integrationId: // value for 'integrationId'
  *   },
  * });
  */
-export function useGetAddOnsForNetsuiteItemsListQuery(baseOptions?: Apollo.QueryHookOptions<GetAddOnsForNetsuiteItemsListQuery, GetAddOnsForNetsuiteItemsListQueryVariables>) {
+export function useGetAddOnsForNetsuiteItemsListQuery(baseOptions: Apollo.QueryHookOptions<GetAddOnsForNetsuiteItemsListQuery, GetAddOnsForNetsuiteItemsListQueryVariables>) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<GetAddOnsForNetsuiteItemsListQuery, GetAddOnsForNetsuiteItemsListQueryVariables>(GetAddOnsForNetsuiteItemsListDocument, options);
       }
@@ -13147,7 +13161,7 @@ export type GetAddOnsForNetsuiteItemsListLazyQueryHookResult = ReturnType<typeof
 export type GetAddOnsForNetsuiteItemsListSuspenseQueryHookResult = ReturnType<typeof useGetAddOnsForNetsuiteItemsListSuspenseQuery>;
 export type GetAddOnsForNetsuiteItemsListQueryResult = Apollo.QueryResult<GetAddOnsForNetsuiteItemsListQuery, GetAddOnsForNetsuiteItemsListQueryVariables>;
 export const GetBillableMetricsForNetsuiteItemsListDocument = gql`
-    query getBillableMetricsForNetsuiteItemsList($page: Int, $limit: Int, $searchTerm: String) {
+    query getBillableMetricsForNetsuiteItemsList($page: Int, $limit: Int, $searchTerm: String, $integrationId: ID!) {
   billableMetrics(page: $page, limit: $limit, searchTerm: $searchTerm) {
     metadata {
       currentPage
@@ -13176,10 +13190,11 @@ export const GetBillableMetricsForNetsuiteItemsListDocument = gql`
  *      page: // value for 'page'
  *      limit: // value for 'limit'
  *      searchTerm: // value for 'searchTerm'
+ *      integrationId: // value for 'integrationId'
  *   },
  * });
  */
-export function useGetBillableMetricsForNetsuiteItemsListQuery(baseOptions?: Apollo.QueryHookOptions<GetBillableMetricsForNetsuiteItemsListQuery, GetBillableMetricsForNetsuiteItemsListQueryVariables>) {
+export function useGetBillableMetricsForNetsuiteItemsListQuery(baseOptions: Apollo.QueryHookOptions<GetBillableMetricsForNetsuiteItemsListQuery, GetBillableMetricsForNetsuiteItemsListQueryVariables>) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<GetBillableMetricsForNetsuiteItemsListQuery, GetBillableMetricsForNetsuiteItemsListQueryVariables>(GetBillableMetricsForNetsuiteItemsListDocument, options);
       }