diff --git a/catalog-rest-service/src/main/resources/ui/src/components/common/table-data-card/TableDataCard.tsx b/catalog-rest-service/src/main/resources/ui/src/components/common/table-data-card/TableDataCard.tsx
index b40d6b2a539..383f4723e01 100644
--- a/catalog-rest-service/src/main/resources/ui/src/components/common/table-data-card/TableDataCard.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/components/common/table-data-card/TableDataCard.tsx
@@ -48,7 +48,7 @@ const TableDataCard: FunctionComponent<Props> = ({
   name,
   owner = '--',
   description,
-  tier = 'No Tier',
+  tier = '',
   usage,
   serviceType,
   fullyQualifiedName,
@@ -66,9 +66,18 @@ const TableDataCard: FunctionComponent<Props> = ({
           ? getUsagePercentile(usage)
           : undefined,
     },
-    { key: 'Tier', value: tier },
+    { key: 'Tier', value: tier ? tier : 'No Tier' },
   ];
 
+  const getAssetTags = () => {
+    const assetTags = [...(tags as Array<string>)];
+    if (tier) {
+      assetTags.unshift(tier);
+    }
+
+    return [...new Set(assetTags)];
+  };
+
   return (
     <div
       className="tw-bg-white tw-p-3 tw-border tw-border-main tw-rounded-md"
@@ -91,7 +100,7 @@ const TableDataCard: FunctionComponent<Props> = ({
         <TableDataCardBody
           description={description || ''}
           extraInfo={OtherDetails}
-          tags={[...new Set(tags)]}
+          tags={getAssetTags()}
         />
       </div>
       {matches && matches.length > 0 ? (