diff --git a/.storybook/custom/addons/theme-switcher/preset.js b/.storybook/custom/addons/theme-switcher/preset.js
deleted file mode 100644
index 4b2b6736b5..0000000000
--- a/.storybook/custom/addons/theme-switcher/preset.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export function managerEntries(entry = []) {
-    return [...entry, require.resolve('./register')];
-}
diff --git a/packages/storybook/src/lib/decorators/contentDensity.ts b/packages/storybook/src/lib/decorators/contentDensity.ts
index 04793bb10b..41720858ed 100644
--- a/packages/storybook/src/lib/decorators/contentDensity.ts
+++ b/packages/storybook/src/lib/decorators/contentDensity.ts
@@ -1,8 +1,8 @@
 import { makeDecorator } from 'storybook/preview-api';
 
 export const withContentDensity = makeDecorator({
-    name: 'directionalityProvider',
-    parameterName: 'directionality',
+    name: 'contentDensityProvider',
+    parameterName: 'contentDensity',
     wrapper: (storyFn, context) => {
         const contentDensity = context?.globals?.['contentDensity'] || 'cozy';
         const story = storyFn(context);
diff --git a/packages/storybook/tests/contentDensity.test.ts b/packages/storybook/tests/contentDensity.test.ts
new file mode 100644
index 0000000000..30d5d966d9
--- /dev/null
+++ b/packages/storybook/tests/contentDensity.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, it } from 'vitest';
+import { withContentDensity } from '../src/lib/decorators/contentDensity';
+
+const story = () => '<span>Story</span>';
+
+const renderWithParameters = (parameters: Record<string, unknown>) =>
+    withContentDensity(story, {
+        globals: { contentDensity: 'compact' },
+        parameters
+    });
+
+describe('withContentDensity', () => {
+    it('can be disabled with the contentDensity parameter', () => {
+        expect(renderWithParameters({ contentDensity: { disable: true } })).toBe(story());
+    });
+
+    it('is not disabled by the directionality parameter', () => {
+        expect(renderWithParameters({ directionality: { disable: true } })).toContain('class="is-compact"');
+    });
+});