diff --git a/src/components/Form/Controls/Action/__snapshots__/Action.test.tsx.snap b/src/components/Form/Controls/Action/__snapshots__/Action.test.tsx.snap
index b172598d..1d398017 100644
--- a/src/components/Form/Controls/Action/__snapshots__/Action.test.tsx.snap
+++ b/src/components/Form/Controls/Action/__snapshots__/Action.test.tsx.snap
@@ -13,7 +13,6 @@ exports[`ActionInput > renders 1`] = `
       aria-controls=":r0:"
       aria-label="Click me!"
       class="_action_1689d3"
-      data-state="closed"
       type="button"
     >
       <svg
diff --git a/src/components/Form/Controls/Password/__snapshots__/Password.test.tsx.snap b/src/components/Form/Controls/Password/__snapshots__/Password.test.tsx.snap
index 12e4c435..5588bf35 100644
--- a/src/components/Form/Controls/Password/__snapshots__/Password.test.tsx.snap
+++ b/src/components/Form/Controls/Password/__snapshots__/Password.test.tsx.snap
@@ -15,7 +15,6 @@ exports[`PasswordControl > switches the input type > invisible 1`] = `
       aria-controls=":r0:"
       aria-label="Show"
       class="_action_1689d3"
-      data-state="closed"
       type="button"
     >
       <svg
@@ -52,7 +51,6 @@ exports[`PasswordControl > switches the input type > invisible 2`] = `
       aria-describedby=":r3:"
       aria-label="Show"
       class="_action_1689d3"
-      data-state="open"
       type="button"
     >
       <svg
@@ -89,7 +87,6 @@ exports[`PasswordControl > switches the input type > visible 1`] = `
       aria-describedby=":r3:"
       aria-label="Hide"
       class="_action_1689d3"
-      data-state="open"
       type="button"
     >
       <svg
diff --git a/src/components/Tooltip/Tooltip.tsx b/src/components/Tooltip/Tooltip.tsx
index 1187a089..809e85b8 100644
--- a/src/components/Tooltip/Tooltip.tsx
+++ b/src/components/Tooltip/Tooltip.tsx
@@ -160,7 +160,6 @@ function TooltipAnchor({ children }: Readonly<PropsWithChildren>): JSX.Element {
     context.getReferenceProps({
       ref,
       ...children.props,
-      "data-state": context.open ? "open" : "closed",
     }),
   );
 }
diff --git a/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap b/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap
index 19d9982a..abc718a4 100644
--- a/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap
+++ b/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap
@@ -47,7 +47,6 @@ exports[`Tooltip > opens tooltip on focus where trigger is non interactive 1`] =
     style="padding: 100px;"
   >
     <span
-      data-state="closed"
       tabindex="0"
     >
       <button
@@ -134,7 +133,6 @@ exports[`Tooltip > overrides default tab index for non interactive triggers 1`]
     style="padding: 100px;"
   >
     <span
-      data-state="closed"
       tabindex="-1"
     >
       <button
@@ -179,9 +177,7 @@ exports[`Tooltip > renders closed by default 1`] = `
   <div
     style="padding: 100px;"
   >
-    <span
-      data-state="closed"
-    >
+    <span>
       No tooltip to see here
     </span>
   </div>
@@ -237,7 +233,6 @@ exports[`Tooltip > renders open by default 1`] = `
     <button
       aria-describedby=":r2:"
       class="_icon-button_e3253e"
-      data-state="open"
       data-testid="testbutton"
       role="button"
       style="--cpd-icon-button-size: 32px;"
@@ -319,7 +314,6 @@ exports[`Tooltip > renders with caption 1`] = `
   >
     <button
       class="_icon-button_e3253e"
-      data-state="closed"
       data-testid="testbutton"
       role="button"
       style="--cpd-icon-button-size: 32px;"