diff --git a/src/elements/radio-button/radio-button-group/radio-button-group.stories.ts b/src/elements/radio-button/radio-button-group/radio-button-group.stories.ts
index 862200a5c8..127517c342 100644
--- a/src/elements/radio-button/radio-button-group/radio-button-group.stories.ts
+++ b/src/elements/radio-button/radio-button-group/radio-button-group.stories.ts
@@ -8,6 +8,7 @@ import { styleMap, type StyleInfo } from 'lit/directives/style-map.js';
 import { sbbSpread } from '../../../storybook/helpers/spread.js';
 import type { SbbFormErrorElement } from '../../form-error.js';
 
+import type { SbbRadioButtonGroupElement } from './radio-button-group.js';
 import readme from './readme.md?raw';
 import './radio-button-group.js';
 import '../radio-button.js';
@@ -145,8 +146,8 @@ const ErrorMessageTemplate = (args: Args): TemplateResult => {
   return html`
     <sbb-radio-button-group
       ${sbbSpread(args)}
-      @change=${(event: CustomEvent) => {
-        if (event.detail.value) {
+      @change=${(event: Event) => {
+        if ((event.currentTarget as SbbRadioButtonGroupElement).value) {
           sbbFormError.remove();
         } else if (args.required) {
           (event.target as HTMLElement).closest('sbb-radio-button-group')?.append(sbbFormError);
diff --git a/src/visual-regression-app/src/components/test-case/image-diff/fullscreen-diff/fullscreen-diff.ts b/src/visual-regression-app/src/components/test-case/image-diff/fullscreen-diff/fullscreen-diff.ts
index 21bd1df563..43a49435d4 100644
--- a/src/visual-regression-app/src/components/test-case/image-diff/fullscreen-diff/fullscreen-diff.ts
+++ b/src/visual-regression-app/src/components/test-case/image-diff/fullscreen-diff/fullscreen-diff.ts
@@ -30,16 +30,17 @@ class FullscreenDiff extends LitElement {
       return html``;
     }
     return html`<div class="app-labels">
-        <sbb-chip-label size="xxs" color="white"
-          >${this.screenshotFiles.browserName}</sbb-chip-label
-        >
+        <sbb-chip-label size="xxs" color="white">
+          ${this.screenshotFiles.browserName}
+        </sbb-chip-label>
         <sbb-chip-label size="xxs" color="white">${this.screenshotFiles.viewport}</sbb-chip-label>
       </div>
       <sbb-radio-button-group
         class="app-radio-button-group"
         value=${this.selectedFile}
         @change=${(event: Event) =>
-          (this.selectedFile = (event.target as SbbRadioButtonGroupElement).value as DiffFileType)}
+          (this.selectedFile = (event.currentTarget as SbbRadioButtonGroupElement)
+            .value as DiffFileType)}
       >
         ${!this.screenshotFiles.isNew
           ? html`<sbb-radio-button value="baselineFile">Baseline</sbb-radio-button>`