diff --git a/ui/v2.5/src/components/Shared/CountryLabel.tsx b/ui/v2.5/src/components/Shared/CountryLabel.tsx
index 3fb57e749..82c83bfc4 100644
--- a/ui/v2.5/src/components/Shared/CountryLabel.tsx
+++ b/ui/v2.5/src/components/Shared/CountryLabel.tsx
@@ -11,7 +11,9 @@ interface IProps {
 const CountryLabel: React.FC<IProps> = ({ country, showFlag = true }) => {
   const { locale } = useIntl();
 
-  const fromISO = getCountryByISO(country, locale);
+  // #3063 - use alpha2 values only
+  const fromISO =
+    country?.length === 2 ? getCountryByISO(country, locale) : undefined;
 
   return (
     <div>