diff --git a/ui-core/src/components/inputs/StatusMessage.tsx b/ui-core/src/components/inputs/StatusMessage.tsx
index 79871bc8..e11c1868 100644
--- a/ui-core/src/components/inputs/StatusMessage.tsx
+++ b/ui-core/src/components/inputs/StatusMessage.tsx
@@ -37,7 +37,7 @@ const StatusMessage = ({ statusWithMessage, showIcon, small, onClose }: StatusMe
     >
       {showIcon && <InputStatusIcon status={status} small={small} />}
       <span className={cx('status-message', { [status]: status })}>{message}</span>
-      {status === 'info' && (
+      {status === 'info' && tooltip && (
         <button className="status-close" onClick={onClose}>
           <X size="sm" />
         </button>