diff --git a/ui/v2.5/src/components/Shared/CustomFields.tsx b/ui/v2.5/src/components/Shared/CustomFields.tsx
index e063a1f2b64..663a574cb7f 100644
--- a/ui/v2.5/src/components/Shared/CustomFields.tsx
+++ b/ui/v2.5/src/components/Shared/CustomFields.tsx
@@ -42,6 +42,7 @@ const CustomField: React.FC<{ field: string; value: unknown }> = ({
       label={field}
       value={valueStr}
       fullWidth={true}
+      showEmpty
     />
   );
 };
diff --git a/ui/v2.5/src/components/Shared/DetailItem.tsx b/ui/v2.5/src/components/Shared/DetailItem.tsx
index 156c4d9736a..f59dd1000c5 100644
--- a/ui/v2.5/src/components/Shared/DetailItem.tsx
+++ b/ui/v2.5/src/components/Shared/DetailItem.tsx
@@ -7,6 +7,7 @@ interface IDetailItem {
   value?: React.ReactNode;
   title?: string;
   fullWidth?: boolean;
+  showEmpty?: boolean;
 }
 
 export const DetailItem: React.FC<IDetailItem> = ({
@@ -15,8 +16,9 @@ export const DetailItem: React.FC<IDetailItem> = ({
   value,
   title,
   fullWidth,
+  showEmpty = false,
 }) => {
-  if (!id || !value || value === "Na") {
+  if (!id || (!showEmpty && (!value || value === "Na"))) {
     return <></>;
   }