diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts
index 2e31ffa808b9..d56477c3f148 100644
--- a/src/libs/CardUtils.ts
+++ b/src/libs/CardUtils.ts
@@ -9,7 +9,7 @@ import type {TranslationPaths} from '@src/languages/types';
 import type {OnyxValues} from '@src/ONYXKEYS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {BankAccountList, Card, CardFeeds, CardList, CompanyCardFeed, PersonalDetailsList, WorkspaceCardsList} from '@src/types/onyx';
-import type {CardFeedData} from '@src/types/onyx/CardFeeds';
+import type {CompanyCardNicknames, CompanyFeeds} from '@src/types/onyx/CardFeeds';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
 import localeCompare from './LocaleCompare';
@@ -243,10 +243,20 @@ function getCardFeedIcon(cardFeed: CompanyCardFeed | typeof CONST.EXPENSIFY_CARD
     return Illustrations.AmexCompanyCards;
 }
 
-function removeExpensifyCardFromCompanyCards(companyCards?: Record<string, CardFeedData>) {
-    if (!companyCards) {
+function isCustomFeed(feed: CompanyCardFeed): boolean {
+    return [CONST.COMPANY_CARD.FEED_BANK_NAME.MASTER_CARD, CONST.COMPANY_CARD.FEED_BANK_NAME.VISA, CONST.COMPANY_CARD.FEED_BANK_NAME.AMEX].some((value) => value === feed);
+}
+
+function getCompanyFeeds(cardFeeds: OnyxEntry<CardFeeds>): CompanyFeeds {
+    return {...cardFeeds?.settings?.companyCards, ...cardFeeds?.settings?.oAuthAccountDetails};
+}
+
+function removeExpensifyCardFromCompanyCards(cardFeeds: OnyxEntry<CardFeeds>): CompanyFeeds {
+    if (!cardFeeds) {
         return {};
     }
+
+    const companyCards = getCompanyFeeds(cardFeeds);
     return Object.fromEntries(Object.entries(companyCards).filter(([key]) => key !== CONST.EXPENSIFY_CARD.BANK));
 }
 
@@ -283,6 +293,16 @@ const getBankCardDetailsImage = (bank: ValueOf<typeof CONST.COMPANY_CARDS.BANKS>
     return iconMap[bank];
 };
 
+function getCustomOrFormattedFeedName(feed?: CompanyCardFeed, companyCardNicknames?: CompanyCardNicknames): string | undefined {
+    if (!feed) {
+        return;
+    }
+
+    const customFeedName = companyCardNicknames?.[feed];
+    const formattedFeedName = Localize.translateLocal('workspace.companyCards.feedName', {feedName: getCardFeedName(feed)});
+    return customFeedName ?? formattedFeedName;
+}
+
 // We will simplify the logic below once we have #50450 #50451 implemented
 const getCorrectStepForSelectedBank = (selectedBank: ValueOf<typeof CONST.COMPANY_CARDS.BANKS>) => {
     const banksWithFeedType = [
@@ -316,8 +336,8 @@ const getCorrectStepForSelectedBank = (selectedBank: ValueOf<typeof CONST.COMPAN
     return CONST.COMPANY_CARDS.STEP.CARD_TYPE;
 };
 
-function getSelectedFeed(lastSelectedFeed: OnyxEntry<CompanyCardFeed>, cardFeeds: OnyxEntry<CardFeeds>): CompanyCardFeed {
-    const defaultFeed = Object.keys(removeExpensifyCardFromCompanyCards(cardFeeds?.settings?.companyCards)).at(0) as CompanyCardFeed;
+function getSelectedFeed(lastSelectedFeed: OnyxEntry<CompanyCardFeed>, cardFeeds: OnyxEntry<CardFeeds>): CompanyCardFeed | undefined {
+    const defaultFeed = Object.keys(removeExpensifyCardFromCompanyCards(cardFeeds)).at(0) as CompanyCardFeed | undefined;
     return lastSelectedFeed ?? defaultFeed;
 }
 
@@ -340,8 +360,11 @@ export {
     getCompanyCardNumber,
     getCardFeedIcon,
     getCardFeedName,
+    getCompanyFeeds,
+    isCustomFeed,
     getBankCardDetailsImage,
     getSelectedFeed,
     getCorrectStepForSelectedBank,
+    getCustomOrFormattedFeedName,
     removeExpensifyCardFromCompanyCards,
 };
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index fc9601424080..1c0895d2fbc6 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -814,7 +814,7 @@ type SettingsNavigatorParamList = {
     };
     [SCREENS.WORKSPACE.COMPANY_CARD_DETAILS]: {
         policyID: string;
-        bank: string;
+        bank: CompanyCardFeed;
         cardID: string;
         backTo?: Routes;
     };
diff --git a/src/libs/actions/CompanyCards.ts b/src/libs/actions/CompanyCards.ts
index 0c0ea1ada08a..4a102ab9bb72 100644
--- a/src/libs/actions/CompanyCards.ts
+++ b/src/libs/actions/CompanyCards.ts
@@ -10,6 +10,7 @@ import type {
     UpdateCompanyCardNameParams,
 } from '@libs/API/parameters';
 import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import * as CardUtils from '@libs/CardUtils';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import * as NetworkStore from '@libs/Network/NetworkStore';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
@@ -121,19 +122,20 @@ function setWorkspaceCompanyCardFeedName(policyID: string, workspaceAccountID: n
     API.write(WRITE_COMMANDS.SET_COMPANY_CARD_FEED_NAME, parameters, onyxData);
 }
 
-function setWorkspaceCompanyCardTransactionLiability(workspaceAccountID: number, policyID: string, bankName: string, liabilityType: string) {
+function setWorkspaceCompanyCardTransactionLiability(workspaceAccountID: number, policyID: string, bankName: CompanyCardFeed, liabilityType: string) {
     const authToken = NetworkStore.getAuthToken();
+    const isCustomFeed = CardUtils.isCustomFeed(bankName);
+    const feedUpdates = {
+        [bankName]: {liabilityType},
+    };
+
     const onyxData: OnyxData = {
         optimisticData: [
             {
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`,
                 value: {
-                    settings: {
-                        companyCards: {
-                            [bankName]: {liabilityType},
-                        },
-                    },
+                    settings: isCustomFeed ? {companyCards: feedUpdates} : {oAuthAccountDetails: feedUpdates},
                 },
             },
         ],
@@ -149,8 +151,10 @@ function setWorkspaceCompanyCardTransactionLiability(workspaceAccountID: number,
     API.write(WRITE_COMMANDS.SET_COMPANY_CARD_TRANSACTION_LIABILITY, parameters, onyxData);
 }
 
-function deleteWorkspaceCompanyCardFeed(policyID: string, workspaceAccountID: number, bankName: string) {
+function deleteWorkspaceCompanyCardFeed(policyID: string, workspaceAccountID: number, bankName: CompanyCardFeed) {
     const authToken = NetworkStore.getAuthToken();
+    const isCustomFeed = CardUtils.isCustomFeed(bankName);
+    const feedUpdates = {[bankName]: null};
 
     const onyxData: OnyxData = {
         optimisticData: [
@@ -159,9 +163,7 @@ function deleteWorkspaceCompanyCardFeed(policyID: string, workspaceAccountID: nu
                 key: `${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`,
                 value: {
                     settings: {
-                        companyCards: {
-                            [bankName]: null,
-                        },
+                        ...(isCustomFeed ? {companyCards: feedUpdates} : {oAuthAccountDetails: feedUpdates}),
                         companyCardNicknames: {
                             [bankName]: null,
                         },
@@ -309,8 +311,12 @@ function unassignWorkspaceCompanyCard(workspaceAccountID: number, bankName: stri
     API.write(WRITE_COMMANDS.UNASSIGN_COMPANY_CARD, parameters, onyxData);
 }
 
-function updateWorkspaceCompanyCard(workspaceAccountID: number, cardID: string, bankName: string) {
+function updateWorkspaceCompanyCard(workspaceAccountID: number, cardID: string, bankName: CompanyCardFeed) {
     const authToken = NetworkStore.getAuthToken();
+    const isCustomFeed = CardUtils.isCustomFeed(bankName);
+    const optimisticFeedUpdates = {[bankName]: {errors: null}};
+    const failureFeedUpdates = {[bankName]: {errors: {error: CONST.COMPANY_CARDS.CONNECTION_ERROR}}};
+
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -346,13 +352,7 @@ function updateWorkspaceCompanyCard(workspaceAccountID: number, cardID: string,
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`,
             value: {
-                settings: {
-                    companyCards: {
-                        [bankName]: {
-                            errors: null,
-                        },
-                    },
-                },
+                settings: isCustomFeed ? {companyCards: optimisticFeedUpdates} : {oAuthAccountDetails: optimisticFeedUpdates},
             },
         },
     ];
@@ -419,13 +419,7 @@ function updateWorkspaceCompanyCard(workspaceAccountID: number, cardID: string,
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`,
             value: {
-                settings: {
-                    companyCards: {
-                        [bankName]: {
-                            errors: {error: CONST.COMPANY_CARDS.CONNECTION_ERROR},
-                        },
-                    },
-                },
+                settings: isCustomFeed ? {companyCards: failureFeedUpdates} : {oAuthAccountDetails: failureFeedUpdates},
             },
         },
     ];
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 8d7acf236967..c5098ed08be7 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -20,6 +20,7 @@ import useSingleExecution from '@hooks/useSingleExecution';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
 import {isConnectionInProgress} from '@libs/actions/connections';
+import * as CardUtils from '@libs/CardUtils';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import getTopmostRouteName from '@libs/Navigation/getTopmostRouteName';
 import Navigation from '@libs/Navigation/Navigation';
@@ -220,12 +221,14 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
     }
 
     if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED]) {
+        const hasPolicyFeedsError = PolicyUtils.hasPolicyFeedsError(CardUtils.getCompanyFeeds(cardFeeds));
+
         protectedCollectPolicyMenuItems.push({
             translationKey: 'workspace.common.companyCards',
             icon: Expensicons.CreditCard,
             action: singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID)))),
             routeName: SCREENS.WORKSPACE.COMPANY_CARDS,
-            brickRoadIndicator: PolicyUtils.hasPolicyFeedsError(cardFeeds?.settings?.companyCards ?? {}) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            brickRoadIndicator: hasPolicyFeedsError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
         });
     }
 
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
index 4eb1f752d176..805cda9a2eba 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
@@ -129,7 +129,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
         subtitleTranslationKey: 'workspace.moreFeatures.companyCards.subtitle',
         isActive: policy?.areCompanyCardsEnabled ?? false,
         pendingAction: policy?.pendingFields?.areCompanyCardsEnabled,
-        disabled: !isEmptyObject(CardUtils.removeExpensifyCardFromCompanyCards(cardFeeds?.settings?.companyCards)),
+        disabled: !isEmptyObject(CardUtils.removeExpensifyCardFromCompanyCards(cardFeeds)),
         action: (isEnabled: boolean) => {
             if (!policyID) {
                 return;
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx
index 684ee0660d28..50eb27df790b 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx
@@ -41,15 +41,16 @@ function WorkspaceCompanyCardFeedSelectorPage({route}: WorkspaceCompanyCardFeedS
     const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
     const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`);
     const selectedFeed = CardUtils.getSelectedFeed(lastSelectedFeed, cardFeeds);
-    const availableCards = CardUtils.removeExpensifyCardFromCompanyCards(cardFeeds?.settings?.companyCards);
+    const companyFeeds = CardUtils.getCompanyFeeds(cardFeeds);
+    const availableCards = CardUtils.removeExpensifyCardFromCompanyCards(cardFeeds);
 
     const feeds: CardFeedListItem[] = (Object.keys(availableCards) as CompanyCardFeed[]).map((feed) => ({
         value: feed,
         text: cardFeeds?.settings?.companyCardNicknames?.[feed] ?? CardUtils.getCardFeedName(feed),
         keyForList: feed,
         isSelected: feed === selectedFeed,
-        brickRoadIndicator: cardFeeds?.settings?.companyCards?.[feed]?.errors ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
-        canShowSeveralIndicators: !!cardFeeds?.settings?.companyCards?.[feed]?.errors,
+        brickRoadIndicator: companyFeeds[feed]?.errors ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+        canShowSeveralIndicators: !!companyFeeds[feed]?.errors,
         leftElement: (
             <Icon
                 src={CardUtils.getCardFeedIcon(feed)}
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx
index 9c09abd5646f..031ac309e155 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx
@@ -16,7 +16,6 @@ import * as CardUtils from '@libs/CardUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import Navigation from '@navigation/Navigation';
 import variables from '@styles/variables';
-import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {CompanyCardFeed} from '@src/types/onyx';
@@ -39,13 +38,13 @@ function WorkspaceCompanyCardsListHeaderButtons({policyID, selectedFeed}: Worksp
     const shouldChangeLayout = isMediumScreenWidth || shouldUseNarrowLayout;
     const feedName = CardUtils.getCardFeedName(selectedFeed);
     const formattedFeedName = translate('workspace.companyCards.feedName', {feedName});
-    const isCustomFeed =
-        CONST.COMPANY_CARD.FEED_BANK_NAME.MASTER_CARD === selectedFeed || CONST.COMPANY_CARD.FEED_BANK_NAME.VISA === selectedFeed || CONST.COMPANY_CARD.FEED_BANK_NAME.AMEX === selectedFeed;
-    const currentFeedData = cardFeeds?.settings?.companyCards?.[selectedFeed] ?? cardFeeds?.settings?.oAuthAccountDetails?.[selectedFeed] ?? {pending: true, errors: {}};
+    const isCustomFeed = CardUtils.isCustomFeed(selectedFeed);
+    const companyFeeds = CardUtils.getCompanyFeeds(cardFeeds);
+    const currentFeedData = companyFeeds?.[selectedFeed];
 
     return (
         <OfflineWithFeedback
-            errors={cardFeeds?.settings?.companyCards?.[selectedFeed]?.errors}
+            errors={currentFeedData?.errors}
             canDismissError={false}
             errorRowStyles={styles.ph5}
         >
@@ -65,7 +64,7 @@ function WorkspaceCompanyCardsListHeaderButtons({policyID, selectedFeed}: Worksp
                             <CaretWrapper>
                                 <Text style={styles.textStrong}>{formattedFeedName}</Text>
                             </CaretWrapper>
-                            {PolicyUtils.hasPolicyFeedsError(cardFeeds?.settings?.companyCards ?? {}, selectedFeed) && (
+                            {PolicyUtils.hasPolicyFeedsError(companyFeeds, selectedFeed) && (
                                 <Icon
                                     src={Expensicons.DotIndicator}
                                     fill={theme.danger}
@@ -79,8 +78,7 @@ function WorkspaceCompanyCardsListHeaderButtons({policyID, selectedFeed}: Worksp
                 <View style={[styles.flexRow, styles.gap2]}>
                     <Button
                         success
-                        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                        isDisabled={currentFeedData.pending || !!currentFeedData.errors}
+                        isDisabled={!currentFeedData || !!currentFeedData?.pending || !!currentFeedData?.errors}
                         onPress={() => Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD.getRoute(policyID, selectedFeed))}
                         icon={Expensicons.Plus}
                         text={translate('workspace.companyCards.assignCard')}
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
index d8f2003d2f70..9378da7c6599 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
@@ -35,11 +35,11 @@ function WorkspaceCompanyCardPage({route}: WorkspaceCompanyCardPageProps) {
     const selectedFeed = CardUtils.getSelectedFeed(lastSelectedFeed, cardFeeds);
     const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${selectedFeed}`);
 
-    const companyCards = CardUtils.removeExpensifyCardFromCompanyCards(cardFeeds?.settings?.companyCards);
+    const companyCards = CardUtils.removeExpensifyCardFromCompanyCards(cardFeeds);
     const isLoading = !cardFeeds || !!(cardFeeds.isLoading && !companyCards);
-    const selectedCompanyCard = companyCards[selectedFeed ?? ''] ?? cardFeeds?.settings?.oAuthAccountDetails?.[selectedFeed ?? ''] ?? null;
-    const isNoFeed = isEmptyObject(companyCards) && isEmptyObject(cardFeeds?.settings?.oAuthAccountDetails) && !selectedCompanyCard;
-    const isPending = !!selectedCompanyCard?.pending;
+    const selectedFeedData = selectedFeed && companyCards[selectedFeed];
+    const isNoFeed = isEmptyObject(companyCards) && !selectedFeedData;
+    const isPending = !!selectedFeedData?.pending;
     const isFeedAdded = !isPending && !isNoFeed;
 
     const fetchCompanyCards = useCallback(() => {
@@ -79,10 +79,10 @@ function WorkspaceCompanyCardPage({route}: WorkspaceCompanyCardPageProps) {
                     includeSafeAreaPaddingBottom
                     showLoadingAsFirstRender={false}
                 >
-                    {(isFeedAdded || isPending) && (
+                    {(isFeedAdded || isPending) && !!selectedFeed && (
                         <WorkspaceCompanyCardsListHeaderButtons
                             policyID={policyID}
-                            selectedFeed={selectedFeed ?? ''}
+                            selectedFeed={selectedFeed}
                         />
                     )}
                     {isNoFeed && <WorkspaceCompanyCardPageEmptyState route={route} />}
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx
index 3bc7a7301163..cb67477fb4bd 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx
@@ -43,7 +43,7 @@ function WorkspaceCompanyCardsSettingsFeedNamePage({
     const [lastSelectedFeed, lastSelectedFeedResult] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`);
     const [cardFeeds, cardFeedsResult] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
     const selectedFeed = CardUtils.getSelectedFeed(lastSelectedFeed, cardFeeds);
-    const feedName = cardFeeds?.settings?.companyCardNicknames?.[selectedFeed] ?? translate('workspace.companyCards.feedName', {feedName: CardUtils.getCardFeedName(selectedFeed)});
+    const feedName = CardUtils.getCustomOrFormattedFeedName(selectedFeed, cardFeeds?.settings?.companyCardNicknames);
 
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_COMPANY_CARD_FEED_NAME>) => {
@@ -60,7 +60,9 @@ function WorkspaceCompanyCardsSettingsFeedNamePage({
     );
 
     const submit = ({name}: WorkspaceCompanyCardFeedName) => {
-        CompanyCards.setWorkspaceCompanyCardFeedName(policyID, workspaceAccountID, selectedFeed, name);
+        if (selectedFeed) {
+            CompanyCards.setWorkspaceCompanyCardFeedName(policyID, workspaceAccountID, selectedFeed, name);
+        }
         Navigation.goBack(ROUTES.WORKSPACE_COMPANY_CARDS_SETTINGS.getRoute(policyID));
     };
 
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx
index a1dfd7dea3eb..41f698f61dab 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx
@@ -40,8 +40,9 @@ function WorkspaceCompanyCardsSettingsPage({
     const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
     const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`);
     const selectedFeed = CardUtils.getSelectedFeed(lastSelectedFeed, cardFeeds);
-    const feedName = cardFeeds?.settings?.companyCardNicknames?.[selectedFeed] ?? translate('workspace.companyCards.feedName', {feedName: CardUtils.getCardFeedName(selectedFeed)});
-    const liabilityType = cardFeeds?.settings?.companyCards?.[selectedFeed]?.liabilityType;
+    const feedName = CardUtils.getCustomOrFormattedFeedName(selectedFeed, cardFeeds?.settings?.companyCardNicknames);
+    const companyFeeds = CardUtils.getCompanyFeeds(cardFeeds);
+    const liabilityType = selectedFeed && companyFeeds[selectedFeed]?.liabilityType;
     const isPersonal = liabilityType === CONST.COMPANY_CARDS.DELETE_TRANSACTIONS.ALLOW;
 
     const navigateToChangeFeedName = () => {
@@ -49,12 +50,17 @@ function WorkspaceCompanyCardsSettingsPage({
     };
 
     const deleteCompanyCardFeed = () => {
-        CompanyCards.deleteWorkspaceCompanyCardFeed(policyID, workspaceAccountID, selectedFeed);
+        if (selectedFeed) {
+            CompanyCards.deleteWorkspaceCompanyCardFeed(policyID, workspaceAccountID, selectedFeed);
+        }
         setDeleteCompanyCardConfirmModalVisible(false);
         Navigation.setNavigationActionToMicrotaskQueue(Navigation.goBack);
     };
 
     const onToggleLiability = (isOn: boolean) => {
+        if (!selectedFeed) {
+            return;
+        }
         CompanyCards.setWorkspaceCompanyCardTransactionLiability(
             workspaceAccountID,
             policyID,
@@ -102,7 +108,7 @@ function WorkspaceCompanyCardsSettingsPage({
                         isVisible={deleteCompanyCardConfirmModalVisible}
                         onConfirm={deleteCompanyCardFeed}
                         onCancel={() => setDeleteCompanyCardConfirmModalVisible(false)}
-                        title={translate('workspace.moreFeatures.companyCards.removeCardFeedTitle', {feedName})}
+                        title={feedName && translate('workspace.moreFeatures.companyCards.removeCardFeedTitle', {feedName})}
                         prompt={translate('workspace.moreFeatures.companyCards.removeCardFeedDescription')}
                         confirmText={translate('common.delete')}
                         cancelText={translate('common.cancel')}
diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
index 3e72beee812b..b0066187e6f1 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
@@ -82,7 +82,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
     const isCurrentUserOwner = policy?.owner === currentUserPersonalDetails?.login;
     const ownerDetails = personalDetails?.[policy?.ownerAccountID ?? -1] ?? ({} as PersonalDetails);
     const policyOwnerDisplayName = ownerDetails.displayName ?? policy?.owner ?? '';
-    const hasMultipleFeeds = Object.values(cardFeeds?.settings?.companyCards ?? {}).filter((feed) => !feed.pending).length > 0;
+    const hasMultipleFeeds = Object.values(CardUtils.getCompanyFeeds(cardFeeds)).filter((feed) => !feed.pending).length > 0;
     const paymentAccountID = cardSettings?.paymentBankAccountID ?? 0;
 
     useEffect(() => {
diff --git a/src/pages/workspace/members/WorkspaceMemberNewCardPage.tsx b/src/pages/workspace/members/WorkspaceMemberNewCardPage.tsx
index 9bee3108c7e5..34e2dd522fa3 100644
--- a/src/pages/workspace/members/WorkspaceMemberNewCardPage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberNewCardPage.tsx
@@ -46,7 +46,7 @@ function WorkspaceMemberNewCardPage({route, personalDetails}: WorkspaceMemberNew
 
     const accountID = Number(route.params.accountID);
     const memberLogin = personalDetails?.[accountID]?.login ?? '';
-    const availableCompanyCards = CardUtils.removeExpensifyCardFromCompanyCards(cardFeeds?.settings?.companyCards);
+    const availableCompanyCards = CardUtils.removeExpensifyCardFromCompanyCards(cardFeeds);
 
     const handleSubmit = () => {
         if (!selectedFeed) {
diff --git a/src/types/onyx/CardFeeds.ts b/src/types/onyx/CardFeeds.ts
index 8ffb1258689d..3f5d82fb05cd 100644
--- a/src/types/onyx/CardFeeds.ts
+++ b/src/types/onyx/CardFeeds.ts
@@ -12,63 +12,75 @@ type CardFeedProvider =
     | typeof CONST.COMPANY_CARD.FEED_BANK_NAME.AMEX
     | typeof CONST.COMPANY_CARD.FEED_BANK_NAME.STRIPE;
 
-/** Card feed data */
-type CardFeedData = {
+/** Custom card feed data */
+type CustomCardFeedData = {
     /** Whether any actions are pending */
-    pending: boolean;
+    pending?: boolean;
 
     /** Determines if Automated Statement Reconciliation (ASR) is enabled for the cards */
-    asrEnabled: boolean;
+    asrEnabled?: boolean;
 
     /** Specifies if the expenses on this card should be force reimbursable */
-    forceReimbursable: string;
+    forceReimbursable?: string;
 
     /** Defines the type of liability for the card */
-    liabilityType: string;
+    liabilityType?: string;
 
     /** Preferred policy */
-    preferredPolicy: string;
+    preferredPolicy?: string;
 
     /** Specifies the format for the report title related to this card */
-    reportTitleFormat: string;
+    reportTitleFormat?: string;
 
     /** Indicates the day when the statement period for this card ends */
-    statementPeriodEndDay: string;
+    statementPeriodEndDay?: string;
 
     /** Broken connection errors */
     errors?: OnyxCommon.Errors;
 };
 
+/** Direct card feed data */
+type DirectCardFeedData = {
+    /** List of accounts */
+    accountList: string[];
+
+    /** Credentials info */
+    credentials: string;
+
+    /** Expiration number */
+    expiration: number;
+
+    /** Defines the type of liability for the card */
+    liabilityType?: string;
+
+    /** Whether any actions are pending */
+    pending?: boolean;
+
+    /** Broken connection errors */
+    errors?: OnyxCommon.Errors;
+};
+
+/** Card feed data */
+type CardFeedData = CustomCardFeedData | DirectCardFeedData;
+
+/** Both custom and direct company feeds */
+type CompanyFeeds = Partial<Record<CompanyCardFeed, CardFeedData>>;
+
+/** Custom feed names */
+type CompanyCardNicknames = Partial<Record<CompanyCardFeed, string>>;
+
 /** Card feeds model */
 type CardFeeds = {
     /** Feed settings */
     settings: {
         /** User-friendly feed nicknames */
-        companyCardNicknames: Record<string, string>;
+        companyCardNicknames?: CompanyCardNicknames;
 
         /** Company cards feeds */
-        companyCards: Record<string, CardFeedData>;
+        companyCards?: Partial<Record<CompanyCardFeed, CustomCardFeedData>>;
 
         /** Account details */
-        oAuthAccountDetails: Record<
-            ValueOf<typeof CONST.COMPANY_CARD.FEED_BANK_NAME>,
-            {
-                /** List of accounts */
-                accountList: string[];
-
-                /** Credentials info */
-                credentials: string;
-
-                /** Expiration number */
-                expiration: number;
-
-                /** Whether any actions are pending */
-                pending?: boolean;
-
-                /** Broken connection errors */
-                errors?: OnyxCommon.Errors;
-            }
-        >;
+        oAuthAccountDetails?: Partial<Record<CompanyCardFeed, DirectCardFeedData>>;
     };
 
     /** Whether we are loading the data via the API */
@@ -112,4 +124,15 @@ type AddNewCompanyCardFeed = {
 };
 
 export default CardFeeds;
-export type {AddNewCardFeedStep, AddNewCompanyCardFeed, AddNewCardFeedData, CardFeedData, CompanyCardFeed, CardFeedProvider};
+export type {
+    AddNewCardFeedStep,
+    AddNewCompanyCardFeed,
+    AddNewCardFeedData,
+    CardFeedData,
+    CustomCardFeedData,
+    CompanyCardFeed,
+    DirectCardFeedData,
+    CardFeedProvider,
+    CompanyFeeds,
+    CompanyCardNicknames,
+};
diff --git a/tests/unit/CardUtilsTest.ts b/tests/unit/CardUtilsTest.ts
index 405b588fa93f..09a36fcfb562 100644
--- a/tests/unit/CardUtilsTest.ts
+++ b/tests/unit/CardUtilsTest.ts
@@ -1,4 +1,8 @@
-import * as cardUtils from '@src/libs/CardUtils';
+import type {OnyxCollection} from 'react-native-onyx';
+import CONST from '@src/CONST';
+import * as CardUtils from '@src/libs/CardUtils';
+import type * as OnyxTypes from '@src/types/onyx';
+import type {CompanyFeeds} from '@src/types/onyx/CardFeeds';
 
 const shortDate = '0924';
 const shortDateSlashed = '09/24';
@@ -9,44 +13,206 @@ const longDateHyphen = '09-2024';
 const expectedMonth = '09';
 const expectedYear = '2024';
 
+const customFeeds = {
+    [CONST.COMPANY_CARD.FEED_BANK_NAME.MASTER_CARD]: {
+        pending: true,
+    },
+    [CONST.COMPANY_CARD.FEED_BANK_NAME.VISA]: {
+        liabilityType: 'personal',
+    },
+    [CONST.EXPENSIFY_CARD.BANK]: {
+        liabilityType: 'personal',
+    },
+};
+const customFeedsWithoutExpensifyBank = {
+    [CONST.COMPANY_CARD.FEED_BANK_NAME.MASTER_CARD]: {
+        pending: true,
+    },
+    [CONST.COMPANY_CARD.FEED_BANK_NAME.VISA]: {
+        liabilityType: 'personal',
+    },
+};
+const directFeeds = {
+    [CONST.COMPANY_CARD.FEED_BANK_NAME.CHASE]: {
+        accountList: ['CREDIT CARD...6607'],
+        credentials: 'xxxxx',
+        expiration: 1730998958,
+    },
+};
+const allFeeds: CompanyFeeds = {...customFeeds, ...directFeeds};
+const customFeedName = 'Custom feed name';
+
+const cardFeedsCollection: OnyxCollection<OnyxTypes.CardFeeds> = {
+    FAKE_ID_1: {
+        settings: {
+            companyCardNicknames: {
+                [CONST.COMPANY_CARD.FEED_BANK_NAME.VISA]: customFeedName,
+            },
+            companyCards: customFeeds,
+            oAuthAccountDetails: directFeeds,
+        },
+    },
+    FAKE_ID_2: {
+        settings: {
+            oAuthAccountDetails: directFeeds,
+        },
+    },
+    FAKE_ID_3: {
+        settings: {
+            companyCards: customFeeds,
+        },
+    },
+};
+
 describe('CardUtils', () => {
-    it('Test MM/YYYY format for getting expirationDate month and year', () => {
-        expect(cardUtils.getMonthFromExpirationDateString(longDateSlashed)).toBe(expectedMonth);
-        expect(cardUtils.getYearFromExpirationDateString(longDateSlashed)).toBe(expectedYear);
-    });
+    describe('Expiration date formatting', () => {
+        it('Should format expirationDate month and year to MM/YYYY', () => {
+            expect(CardUtils.getMonthFromExpirationDateString(longDateSlashed)).toBe(expectedMonth);
+            expect(CardUtils.getYearFromExpirationDateString(longDateSlashed)).toBe(expectedYear);
+        });
 
-    it('Test MM-YYYY format for getting expirationDate month and year', () => {
-        expect(cardUtils.getMonthFromExpirationDateString(longDateHyphen)).toBe(expectedMonth);
-        expect(cardUtils.getYearFromExpirationDateString(longDateHyphen)).toBe(expectedYear);
-    });
+        it('Should format expirationDate month and year to MM-YYYY', () => {
+            expect(CardUtils.getMonthFromExpirationDateString(longDateHyphen)).toBe(expectedMonth);
+            expect(CardUtils.getYearFromExpirationDateString(longDateHyphen)).toBe(expectedYear);
+        });
+
+        it('Should format expirationDate month and year to MMYYYY', () => {
+            expect(CardUtils.getMonthFromExpirationDateString(longDate)).toBe(expectedMonth);
+            expect(CardUtils.getYearFromExpirationDateString(longDate)).toBe(expectedYear);
+        });
+
+        it('Should format expirationDate month and year to MM/YY', () => {
+            expect(CardUtils.getMonthFromExpirationDateString(shortDateSlashed)).toBe(expectedMonth);
+            expect(CardUtils.getYearFromExpirationDateString(shortDateSlashed)).toBe(expectedYear);
+        });
 
-    it('Test MMYYYY format for getting expirationDate month and year', () => {
-        expect(cardUtils.getMonthFromExpirationDateString(longDate)).toBe(expectedMonth);
-        expect(cardUtils.getYearFromExpirationDateString(longDate)).toBe(expectedYear);
+        it('Should format expirationDate month and year to MM-YY', () => {
+            expect(CardUtils.getMonthFromExpirationDateString(shortDateHyphen)).toBe(expectedMonth);
+            expect(CardUtils.getYearFromExpirationDateString(shortDateHyphen)).toBe(expectedYear);
+        });
+
+        it('Should format expirationDate month and year to MMYY', () => {
+            expect(CardUtils.getMonthFromExpirationDateString(shortDate)).toBe(expectedMonth);
+            expect(CardUtils.getYearFromExpirationDateString(shortDate)).toBe(expectedYear);
+        });
+
+        it('Should format to MM/YYYY given MM/YY', () => {
+            expect(CardUtils.formatCardExpiration(shortDateSlashed)).toBe(longDateSlashed);
+            expect(CardUtils.formatCardExpiration(shortDateSlashed)).toBe(longDateSlashed);
+        });
+
+        it('Should format to  MM/YYYY given MMYY', () => {
+            expect(CardUtils.formatCardExpiration(shortDate)).toBe(longDateSlashed);
+            expect(CardUtils.formatCardExpiration(shortDate)).toBe(longDateSlashed);
+        });
     });
 
-    it('Test MM/YY format for getting expirationDate month and year', () => {
-        expect(cardUtils.getMonthFromExpirationDateString(shortDateSlashed)).toBe(expectedMonth);
-        expect(cardUtils.getYearFromExpirationDateString(shortDateSlashed)).toBe(expectedYear);
+    describe('isCustomFeed', () => {
+        it('Should return true for the custom feed', () => {
+            const customFeed = CONST.COMPANY_CARD.FEED_BANK_NAME.VISA;
+            const isCustomFeed = CardUtils.isCustomFeed(customFeed);
+            expect(isCustomFeed).toBe(true);
+        });
+
+        it('Should return false for the direct feed', () => {
+            const directFeed = CONST.COMPANY_CARD.FEED_BANK_NAME.CHASE;
+            const isCustomFeed = CardUtils.isCustomFeed(directFeed);
+            expect(isCustomFeed).toBe(false);
+        });
     });
 
-    it('Test MM-YY format for getting expirationDate month and year', () => {
-        expect(cardUtils.getMonthFromExpirationDateString(shortDateHyphen)).toBe(expectedMonth);
-        expect(cardUtils.getYearFromExpirationDateString(shortDateHyphen)).toBe(expectedYear);
+    describe('getCompanyFeeds', () => {
+        it('Should return both custom and direct feeds if exists', () => {
+            const companyFeeds = CardUtils.getCompanyFeeds(cardFeedsCollection.FAKE_ID_1);
+            expect(companyFeeds).toStrictEqual(allFeeds);
+        });
+
+        it('Should return direct feeds only since custom feeds are not exist', () => {
+            const companyFeeds = CardUtils.getCompanyFeeds(cardFeedsCollection.FAKE_ID_2);
+            expect(companyFeeds).toStrictEqual(directFeeds);
+        });
+
+        it('Should return custom feeds only since direct feeds are not exist', () => {
+            const companyFeeds = CardUtils.getCompanyFeeds(cardFeedsCollection.FAKE_ID_3);
+            expect(companyFeeds).toStrictEqual(customFeeds);
+        });
+
+        it('Should return empty object if undefined is passed', () => {
+            const companyFeeds = CardUtils.getCompanyFeeds(undefined);
+            expect(companyFeeds).toStrictEqual({});
+        });
     });
 
-    it('Test MMYY format for getting expirationDate month and year', () => {
-        expect(cardUtils.getMonthFromExpirationDateString(shortDate)).toBe(expectedMonth);
-        expect(cardUtils.getYearFromExpirationDateString(shortDate)).toBe(expectedYear);
+    describe('removeExpensifyCardFromCompanyCards', () => {
+        it('Should return custom feeds without filtered out "Expensify Card" bank', () => {
+            const companyFeeds = CardUtils.removeExpensifyCardFromCompanyCards(cardFeedsCollection.FAKE_ID_3);
+            expect(companyFeeds).toStrictEqual(customFeedsWithoutExpensifyBank);
+        });
+
+        it('Should return direct feeds without any updates, since there were no "Expensify Card" bank', () => {
+            const companyFeeds = CardUtils.removeExpensifyCardFromCompanyCards(cardFeedsCollection.FAKE_ID_2);
+            expect(companyFeeds).toStrictEqual(directFeeds);
+        });
+
+        it('Should return empty object if undefined is passed', () => {
+            const companyFeeds = CardUtils.removeExpensifyCardFromCompanyCards(undefined);
+            expect(companyFeeds).toStrictEqual({});
+        });
     });
 
-    it('Test MM/YYYY format given MM/YY', () => {
-        expect(cardUtils.formatCardExpiration(shortDateSlashed)).toBe(longDateSlashed);
-        expect(cardUtils.formatCardExpiration(shortDateSlashed)).toBe(longDateSlashed);
+    describe('getSelectedFeed', () => {
+        it('Should return last selected custom feed', () => {
+            const lastSelectedCustomFeed = CONST.COMPANY_CARD.FEED_BANK_NAME.VISA;
+            const selectedFeed = CardUtils.getSelectedFeed(lastSelectedCustomFeed, cardFeedsCollection.FAKE_ID_1);
+            expect(selectedFeed).toBe(lastSelectedCustomFeed);
+        });
+
+        it('Should return last selected direct feed', () => {
+            const lastSelectedDirectFeed = CONST.COMPANY_CARD.FEED_BANK_NAME.CHASE;
+            const selectedFeed = CardUtils.getSelectedFeed(lastSelectedDirectFeed, cardFeedsCollection.FAKE_ID_1);
+            expect(selectedFeed).toBe(lastSelectedDirectFeed);
+        });
+
+        it('Should return the first available custom feed if lastSelectedFeed is undefined', () => {
+            const lastSelectedFeed = undefined;
+            const selectedFeed = CardUtils.getSelectedFeed(lastSelectedFeed, cardFeedsCollection.FAKE_ID_3);
+            expect(selectedFeed).toBe(CONST.COMPANY_CARD.FEED_BANK_NAME.MASTER_CARD);
+        });
+
+        it('Should return the first available direct feed if lastSelectedFeed is undefined', () => {
+            const lastSelectedFeed = undefined;
+            const selectedFeed = CardUtils.getSelectedFeed(lastSelectedFeed, cardFeedsCollection.FAKE_ID_2);
+            expect(selectedFeed).toBe(CONST.COMPANY_CARD.FEED_BANK_NAME.CHASE);
+        });
+
+        it('Should return undefined if lastSelectedFeed is undefined and there is no card feeds', () => {
+            const lastSelectedFeed = undefined;
+            const cardFeeds = undefined;
+            const selectedFeed = CardUtils.getSelectedFeed(lastSelectedFeed, cardFeeds);
+            expect(selectedFeed).toBe(undefined);
+        });
     });
 
-    it('Test MM/YYYY format given MMYY', () => {
-        expect(cardUtils.formatCardExpiration(shortDate)).toBe(longDateSlashed);
-        expect(cardUtils.formatCardExpiration(shortDate)).toBe(longDateSlashed);
+    describe('getCustomOrFormattedFeedName', () => {
+        it('Should return custom name if exists', () => {
+            const feed = CONST.COMPANY_CARD.FEED_BANK_NAME.VISA;
+            const companyCardNicknames = cardFeedsCollection.FAKE_ID_1?.settings?.companyCardNicknames;
+            const feedName = CardUtils.getCustomOrFormattedFeedName(feed, companyCardNicknames);
+            expect(feedName).toBe(customFeedName);
+        });
+
+        it('Should return formatted name if there is no custom name', () => {
+            const feed = CONST.COMPANY_CARD.FEED_BANK_NAME.VISA;
+            const companyCardNicknames = cardFeedsCollection.FAKE_ID_3?.settings?.companyCardNicknames;
+            const feedName = CardUtils.getCustomOrFormattedFeedName(feed, companyCardNicknames);
+            expect(feedName).toBe('Visa cards');
+        });
+
+        it('Should return undefined if no feed provided', () => {
+            const feed = undefined;
+            const companyCardNicknames = cardFeedsCollection.FAKE_ID_1?.settings?.companyCardNicknames;
+            const feedName = CardUtils.getCustomOrFormattedFeedName(feed, companyCardNicknames);
+            expect(feedName).toBe(undefined);
+        });
     });
 });