diff --git a/packages/components/src/components/span/InternalUnderlinedAccessKey.tsx b/packages/components/src/components/span/InternalUnderlinedAccessKey.tsx
index ec4bfbe0e3..b54115fa7b 100644
--- a/packages/components/src/components/span/InternalUnderlinedAccessKey.tsx
+++ b/packages/components/src/components/span/InternalUnderlinedAccessKey.tsx
@@ -18,8 +18,8 @@ export const InternalUnderlinedAccessKey = ({ label, accessKey }: Props) => {
 	return (
 		<span>
 			{first}
-			<u>{accessKey}</u>
-			{rest.join(accessKey)}
+			{rest.length ? <u>{accessKey}</u> : null}
+			{rest.length ? rest.join(accessKey) : null}
 		</span>
 	);
 };
diff --git a/packages/samples/react/src/components/button/access-key.tsx b/packages/samples/react/src/components/button/access-key.tsx
index 82be844edf..87363b0c6e 100644
--- a/packages/samples/react/src/components/button/access-key.tsx
+++ b/packages/samples/react/src/components/button/access-key.tsx
@@ -5,6 +5,7 @@ export const ButtonAccessKey: FC = () => (
 	<div className="flex gap-4">
 		<KolButton _label="Mit S access key" _accessKey="S"></KolButton>
 		<KolButton _label="Sehr kleines s" _accessKey="s"></KolButton>
+		<KolButton _label="Access key kommt nicht in label vor" _accessKey="x"></KolButton>
 		<KolButton _label="access key ohne label" _hideLabel _accessKey="s" _icons="codicon codicon-dashboard"></KolButton>
 		<KolButton
 			_label="mit inline icons"
diff --git a/packages/themes/bmf/snapshots/theme-bmf/snapshot-for-button-access-key-firefox-darwin.png b/packages/themes/bmf/snapshots/theme-bmf/snapshot-for-button-access-key-firefox-darwin.png
index 9ae3e385da..cb01ba8311 100644
Binary files a/packages/themes/bmf/snapshots/theme-bmf/snapshot-for-button-access-key-firefox-darwin.png and b/packages/themes/bmf/snapshots/theme-bmf/snapshot-for-button-access-key-firefox-darwin.png differ
diff --git a/packages/themes/bzst/snapshots/theme-bzst/snapshot-for-button-access-key-firefox-darwin.png b/packages/themes/bzst/snapshots/theme-bzst/snapshot-for-button-access-key-firefox-darwin.png
index a87a295601..8346b28e0d 100644
Binary files a/packages/themes/bzst/snapshots/theme-bzst/snapshot-for-button-access-key-firefox-darwin.png and b/packages/themes/bzst/snapshots/theme-bzst/snapshot-for-button-access-key-firefox-darwin.png differ
diff --git a/packages/themes/default/snapshots/theme-default/snapshot-for-button-access-key-firefox-darwin.png b/packages/themes/default/snapshots/theme-default/snapshot-for-button-access-key-firefox-darwin.png
index 590576b8a6..65ef055563 100644
Binary files a/packages/themes/default/snapshots/theme-default/snapshot-for-button-access-key-firefox-darwin.png and b/packages/themes/default/snapshots/theme-default/snapshot-for-button-access-key-firefox-darwin.png differ
diff --git a/packages/themes/ecl/snapshots/theme-ecl_ec/snapshot-for-button-access-key-firefox-darwin.png b/packages/themes/ecl/snapshots/theme-ecl_ec/snapshot-for-button-access-key-firefox-darwin.png
index a633781ca8..b73abdc76c 100644
Binary files a/packages/themes/ecl/snapshots/theme-ecl_ec/snapshot-for-button-access-key-firefox-darwin.png and b/packages/themes/ecl/snapshots/theme-ecl_ec/snapshot-for-button-access-key-firefox-darwin.png differ
diff --git a/packages/themes/ecl/snapshots/theme-ecl_eu/snapshot-for-button-access-key-firefox-darwin.png b/packages/themes/ecl/snapshots/theme-ecl_eu/snapshot-for-button-access-key-firefox-darwin.png
index 63ccb01d1d..68bfb8330e 100644
Binary files a/packages/themes/ecl/snapshots/theme-ecl_eu/snapshot-for-button-access-key-firefox-darwin.png and b/packages/themes/ecl/snapshots/theme-ecl_eu/snapshot-for-button-access-key-firefox-darwin.png differ
diff --git a/packages/themes/itzbund/snapshots/theme-itzbund/snapshot-for-button-access-key-firefox-darwin.png b/packages/themes/itzbund/snapshots/theme-itzbund/snapshot-for-button-access-key-firefox-darwin.png
index fc53344394..59f7f8de35 100644
Binary files a/packages/themes/itzbund/snapshots/theme-itzbund/snapshot-for-button-access-key-firefox-darwin.png and b/packages/themes/itzbund/snapshots/theme-itzbund/snapshot-for-button-access-key-firefox-darwin.png differ
diff --git a/packages/themes/mfm/snapshots/theme-mfm/snapshot-for-button-access-key-firefox-darwin.png b/packages/themes/mfm/snapshots/theme-mfm/snapshot-for-button-access-key-firefox-darwin.png
index 5601754799..cb555e95a6 100644
Binary files a/packages/themes/mfm/snapshots/theme-mfm/snapshot-for-button-access-key-firefox-darwin.png and b/packages/themes/mfm/snapshots/theme-mfm/snapshot-for-button-access-key-firefox-darwin.png differ
diff --git a/packages/themes/zoll/snapshots/theme-mapz/snapshot-for-button-access-key-firefox-darwin.png b/packages/themes/zoll/snapshots/theme-mapz/snapshot-for-button-access-key-firefox-darwin.png
index 700d3465e2..04761d8d79 100644
Binary files a/packages/themes/zoll/snapshots/theme-mapz/snapshot-for-button-access-key-firefox-darwin.png and b/packages/themes/zoll/snapshots/theme-mapz/snapshot-for-button-access-key-firefox-darwin.png differ
diff --git a/packages/themes/zoll/snapshots/theme-zollv2/snapshot-for-button-access-key-firefox-darwin.png b/packages/themes/zoll/snapshots/theme-zollv2/snapshot-for-button-access-key-firefox-darwin.png
index c62d6c882f..db3a10dcbb 100644
Binary files a/packages/themes/zoll/snapshots/theme-zollv2/snapshot-for-button-access-key-firefox-darwin.png and b/packages/themes/zoll/snapshots/theme-zollv2/snapshot-for-button-access-key-firefox-darwin.png differ
diff --git a/packages/themes/zoll/snapshots/theme-zollv3/snapshot-for-button-access-key-firefox-darwin.png b/packages/themes/zoll/snapshots/theme-zollv3/snapshot-for-button-access-key-firefox-darwin.png
index 02430a906d..b372625885 100644
Binary files a/packages/themes/zoll/snapshots/theme-zollv3/snapshot-for-button-access-key-firefox-darwin.png and b/packages/themes/zoll/snapshots/theme-zollv3/snapshot-for-button-access-key-firefox-darwin.png differ