diff --git a/libs/ui-lib/lib/cim/components/common/CpuArchitectureDropdown.tsx b/libs/ui-lib/lib/cim/components/common/CpuArchitectureDropdown.tsx
index 3f5ca415bb..4c77b9415a 100644
--- a/libs/ui-lib/lib/cim/components/common/CpuArchitectureDropdown.tsx
+++ b/libs/ui-lib/lib/cim/components/common/CpuArchitectureDropdown.tsx
@@ -54,7 +54,7 @@ const CpuArchitectureDropdown = ({
             isAriaDisabled={!isItemEnabled}
             selected={arch === value}
             description={architectureData[arch].description}
-            tooltipProps={{ content: disabledReason, position: 'top' }}
+            tooltipProps={{ content: disabledReason, position: 'top', hidden: isItemEnabled }}
             onClick={(e: React.MouseEvent) => e.preventDefault()}
           >
             {architectureData[arch].label}