diff --git a/packages/react-core/src/components/Checkbox/Checkbox.tsx b/packages/react-core/src/components/Checkbox/Checkbox.tsx
index 93b9816e4c0..dab227caceb 100644
--- a/packages/react-core/src/components/Checkbox/Checkbox.tsx
+++ b/packages/react-core/src/components/Checkbox/Checkbox.tsx
@@ -137,7 +137,7 @@ class Checkbox extends React.Component<CheckboxProps, CheckboxState> {
     const labelRendered = label ? (
       <Label
         className={css(styles.checkLabel, isDisabled && styles.modifiers.disabled)}
-        htmlFor={!wrapWithLabel && props.id}
+        htmlFor={!wrapWithLabel ? props.id : undefined}
       >
         {label}
         {isRequired && (
@@ -154,7 +154,7 @@ class Checkbox extends React.Component<CheckboxProps, CheckboxState> {
     return (
       <Component
         className={css(styles.check, !label && styles.modifiers.standalone, className)}
-        htmlFor={wrapWithLabel && props.id}
+        htmlFor={wrapWithLabel ? props.id : undefined}
       >
         {isLabelBeforeButton ? (
           <>
diff --git a/packages/react-core/src/components/Radio/Radio.tsx b/packages/react-core/src/components/Radio/Radio.tsx
index b02675c4b22..e2414707b8d 100644
--- a/packages/react-core/src/components/Radio/Radio.tsx
+++ b/packages/react-core/src/components/Radio/Radio.tsx
@@ -119,7 +119,7 @@ class Radio extends React.Component<RadioProps, { ouiaStateId: string }> {
     const labelRendered = label ? (
       <Label
         className={css(styles.radioLabel, isDisabled && styles.modifiers.disabled)}
-        htmlFor={!wrapWithLabel && props.id}
+        htmlFor={!wrapWithLabel ? props.id : undefined}
       >
         {label}
       </Label>
@@ -130,7 +130,7 @@ class Radio extends React.Component<RadioProps, { ouiaStateId: string }> {
     return (
       <Component
         className={css(styles.radio, !label && styles.modifiers.standalone, className)}
-        htmlFor={wrapWithLabel && props.id}
+        htmlFor={wrapWithLabel ? props.id : undefined}
       >
         {isLabelBeforeButton ? (
           <>