diff --git a/.changeset/perfect-plants-trade.md b/.changeset/perfect-plants-trade.md
new file mode 100644
index 00000000000..821cf28bba9
--- /dev/null
+++ b/.changeset/perfect-plants-trade.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Update base component for Checkbox and Radio to pass along correct prop type in React 19
diff --git a/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroup.tsx b/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroup.tsx
index dbe52aca196..9072e0fa67b 100644
--- a/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroup.tsx
+++ b/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroup.tsx
@@ -108,10 +108,12 @@ const CheckboxOrRadioGroup: React.FC<React.PropsWithChildren<CheckboxOrRadioGrou
             <Box
               className={clsx(className, classes.GroupFieldset)}
               data-validation={validationChild ? '' : undefined}
-              {...(labelChild && {
-                as: 'fieldset',
-                disabled,
-              })}
+              {...(labelChild
+                ? {
+                    as: 'fieldset',
+                    disabled,
+                  }
+                : {})}
               sx={sx}
             >
               {labelChild ? (
@@ -138,12 +140,14 @@ const CheckboxOrRadioGroup: React.FC<React.PropsWithChildren<CheckboxOrRadioGrou
 
               <Body
                 className={classes.Body}
-                {...(!labelChild && {
-                  ['aria-labelledby']: ariaLabelledby,
-                  ['aria-describedby']: [validationMessageId, captionId].filter(Boolean).join(' '),
-                  as: 'div',
-                  role: 'group',
-                })}
+                {...(!labelChild
+                  ? {
+                      ['aria-labelledby']: ariaLabelledby,
+                      ['aria-describedby']: [validationMessageId, captionId].filter(Boolean).join(' '),
+                      as: 'div',
+                      role: 'group',
+                    }
+                  : {})}
               >
                 {React.Children.toArray(rest).filter(child => React.isValidElement(child))}
               </Body>
@@ -174,10 +178,12 @@ const CheckboxOrRadioGroup: React.FC<React.PropsWithChildren<CheckboxOrRadioGrou
           <fieldset
             className={clsx(className, classes.GroupFieldset)}
             data-validation={validationChild ? '' : undefined}
-            {...(labelChild && {
-              as: 'fieldset',
-              disabled,
-            })}
+            {...(labelChild
+              ? {
+                  as: 'fieldset',
+                  disabled,
+                }
+              : {})}
           >
             {labelChild ? (
               /*
@@ -203,12 +209,14 @@ const CheckboxOrRadioGroup: React.FC<React.PropsWithChildren<CheckboxOrRadioGrou
 
             <Body
               className={classes.Body}
-              {...(!labelChild && {
-                ['aria-labelledby']: ariaLabelledby,
-                ['aria-describedby']: [validationMessageId, captionId].filter(Boolean).join(' '),
-                as: 'div',
-                role: 'group',
-              })}
+              {...(!labelChild
+                ? {
+                    ['aria-labelledby']: ariaLabelledby,
+                    ['aria-describedby']: [validationMessageId, captionId].filter(Boolean).join(' '),
+                    as: 'div',
+                    role: 'group',
+                  }
+                : {})}
             >
               {React.Children.toArray(rest).filter(child => React.isValidElement(child))}
             </Body>
@@ -242,10 +250,12 @@ const CheckboxOrRadioGroup: React.FC<React.PropsWithChildren<CheckboxOrRadioGrou
           margin={0}
           mb={validationChild ? 2 : undefined}
           padding={0}
-          {...(labelChild && {
-            as: 'fieldset',
-            disabled,
-          })}
+          {...(labelChild
+            ? {
+                as: 'fieldset',
+                disabled,
+              }
+            : {})}
           className={className}
           sx={sx}
         >
@@ -272,12 +282,14 @@ const CheckboxOrRadioGroup: React.FC<React.PropsWithChildren<CheckboxOrRadioGrou
           )}
 
           <Body
-            {...(!labelChild && {
-              ['aria-labelledby']: ariaLabelledby,
-              ['aria-describedby']: [validationMessageId, captionId].filter(Boolean).join(' '),
-              as: 'div',
-              role: 'group',
-            })}
+            {...(!labelChild
+              ? {
+                  ['aria-labelledby']: ariaLabelledby,
+                  ['aria-describedby']: [validationMessageId, captionId].filter(Boolean).join(' '),
+                  as: 'div',
+                  role: 'group',
+                }
+              : {})}
           >
             {React.Children.toArray(rest).filter(child => React.isValidElement(child))}
           </Body>
