diff --git a/src/Header/Header.tsx b/src/Header/Header.tsx
index 539b8baa5..c81f7cb66 100644
--- a/src/Header/Header.tsx
+++ b/src/Header/Header.tsx
@@ -375,7 +375,7 @@ export const Header = memo(
                                                     )}
                                                 >
                                                     <button
-                                                        id={`${id}-search-button`}
+                                                        id={`${id}-search-close-button`}
                                                         className={fr.cx("fr-btn--close", "fr-btn")}
                                                         aria-controls={searchModalId}
                                                         title={t("close")}
diff --git a/src/Input.tsx b/src/Input.tsx
index ea2b5f713..b47376e35 100644
--- a/src/Input.tsx
+++ b/src/Input.tsx
@@ -160,7 +160,7 @@ export const Input = memo(
                                 classes.nativeInputOrTextArea
                             )}
                             disabled={disabled || undefined}
-                            aria-describedby={messageId}
+                            aria-describedby={state !== "default" ? messageId : undefined}
                             type={textArea ? undefined : nativeInputProps?.type ?? "text"}
                             id={inputId}
                         />
diff --git a/src/Modal/Modal.tsx b/src/Modal/Modal.tsx
index 80e7d0f0f..b5b9545ad 100644
--- a/src/Modal/Modal.tsx
+++ b/src/Modal/Modal.tsx
@@ -62,7 +62,6 @@ const Modal = memo(
         return (
             <dialog
                 aria-labelledby={titleId}
-                role="dialog"
                 id={id}
                 className={cx(fr.cx("fr-modal", topAnchor && "fr-modal--top"), className)}
                 style={style}