diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 071b60df5fe104..a2dc5d34472580 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -2,12 +2,7 @@
## Unreleased
-### Bug Fixes
-
-- `Tooltip`: add `aria-describedby` to the anchor only if not redundant ([#65989](https://github.com/WordPress/gutenberg/pull/65989)).
-- `PaletteEdit`: dedupe palette element slugs ([#65772](https://github.com/WordPress/gutenberg/pull/65772)).
-
-## 28.9.0 (2024-10-03)
+## 28.8.6 (2024-10-14)
### Bug Fixes
@@ -18,9 +13,9 @@
- `Composite`: make items tabbable if active element gets removed ([#65720](https://github.com/WordPress/gutenberg/pull/65720)).
- `DatePicker`: Use compact button size. ([#65653](https://github.com/WordPress/gutenberg/pull/65653)).
- `DropZone`: fix class names on drop ([#65798](https://github.com/WordPress/gutenberg/pull/65798)).
-
-### Enhancements
-
+- `Tooltip`: add `aria-describedby` to the anchor only if not redundant ([#65989](https://github.com/WordPress/gutenberg/pull/65989)).
+- `PaletteEdit`: dedupe palette element slugs ([#65772](https://github.com/WordPress/gutenberg/pull/65772)).
+- `ToggleGroupControl`: Don't autoselect option on first group focus ([#65892](https://github.com/WordPress/gutenberg/pull/65892)).
- `Guide`: Update finish button to use the new default size ([#65680](https://github.com/WordPress/gutenberg/pull/65680)).
## 28.8.0 (2024-09-19)
diff --git a/packages/components/src/toggle-group-control/test/__snapshots__/index.tsx.snap b/packages/components/src/toggle-group-control/test/__snapshots__/index.tsx.snap
index e9b4f4ca22ab85..34b7fa9575a546 100644
--- a/packages/components/src/toggle-group-control/test/__snapshots__/index.tsx.snap
+++ b/packages/components/src/toggle-group-control/test/__snapshots__/index.tsx.snap
@@ -244,7 +244,7 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
class="components-toggle-group-control emotion-8 emotion-9"
data-wp-c16t="true"
data-wp-component="ToggleGroupControl"
- id="toggle-group-control-as-radio-group-11"
+ id="toggle-group-control-as-radio-group-12"
role="radiogroup"
>
{
+ render(
+ { options }
+ );
+
+ const radio = screen.getByRole( 'radio', { name: 'R' } );
+ expect( radio ).not.toBeChecked();
+
+ await press.Tab();
+ expect( radio ).toHaveFocus();
+ expect( radio ).not.toBeChecked();
+ } );
+
it( 'should render tooltip where `showTooltip` === `true`', async () => {
render(
diff --git a/packages/components/src/toggle-group-control/toggle-group-control-option-base/component.tsx b/packages/components/src/toggle-group-control/toggle-group-control-option-base/component.tsx
index 30d74e68913f22..3b33d75ca7c229 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control-option-base/component.tsx
+++ b/packages/components/src/toggle-group-control/toggle-group-control-option-base/component.tsx
@@ -83,7 +83,6 @@ function ToggleGroupControlOptionBase(
value,
children,
showTooltip = false,
- onFocus: onFocusProp,
disabled,
...otherButtonProps
} = buttonProps;
@@ -134,7 +133,6 @@ function ToggleGroupControlOptionBase(