diff --git a/packages/orchestrator-ui-components/src/components/WfoSubscription/WfoCustomerDescriptionsField.tsx b/packages/orchestrator-ui-components/src/components/WfoSubscription/WfoCustomerDescriptionsField.tsx
index e8e5f8983..ec422ee36 100644
--- a/packages/orchestrator-ui-components/src/components/WfoSubscription/WfoCustomerDescriptionsField.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoSubscription/WfoCustomerDescriptionsField.tsx
@@ -42,11 +42,11 @@ export const WfoCustomerDescriptionsField: FC<
     return (
         <div>
             {customerDescriptionsWithName.map(
-                ({ shortcode, fullname, description }) => (
+                ({ shortcode, fullname, description, customerId }) => (
                     <div
-                        key={shortcode}
-                        title={fullname}
-                    >{`${shortcode}: ${description}`}</div>
+                        key={customerId}
+                        title={fullname ?? customerId}
+                    >{`${shortcode ?? customerId}: ${description}`}</div>
                 ),
             )}
         </div>