diff --git a/app/server/src/lib/compiler/__testfixtures__/kitchen_sink.json b/app/server/src/lib/compiler/__testfixtures__/kitchen_sink.json
index e97dd4abfe8..d5698ec8ef7 100644
--- a/app/server/src/lib/compiler/__testfixtures__/kitchen_sink.json
+++ b/app/server/src/lib/compiler/__testfixtures__/kitchen_sink.json
@@ -1,6 +1,6 @@
 {
   "title": "Kitchen Sink",
-  "addons": ["a11y", "knobs", "actions", "links"],
+  "addons": ["knobs", "actions"],
   "parameters": {
     "backgrounds": [
       { "name": "light", "value": "#eeeeee" },
diff --git a/app/server/src/lib/compiler/__testfixtures__/kitchen_sink.snapshot b/app/server/src/lib/compiler/__testfixtures__/kitchen_sink.snapshot
index 5049179d7a7..91cf200d01e 100644
--- a/app/server/src/lib/compiler/__testfixtures__/kitchen_sink.snapshot
+++ b/app/server/src/lib/compiler/__testfixtures__/kitchen_sink.snapshot
@@ -1,16 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`json-to-csf-compiler kitchen_sink.json 1`] = `
-"import { withA11y } from '@storybook/addon-a11y';
-import { withLinks } from '@storybook/addon-links';
-import { array, boolean, color, date, number, object, select, text, withKnobs } from '@storybook/addon-knobs';
+"import { array, boolean, color, date, number, object, select, text, withKnobs } from '@storybook/addon-knobs';
 import { withActions } from '@storybook/addon-actions';
 
 export default {
   title: 'Kitchen Sink',
   decorators: [
-    withA11y,
-    withLinks,
     withKnobs
   ],
   parameters: {
diff --git a/app/server/src/lib/compiler/__testfixtures__/links.json b/app/server/src/lib/compiler/__testfixtures__/links.json
index 4c1974ae191..ee192f0bec8 100644
--- a/app/server/src/lib/compiler/__testfixtures__/links.json
+++ b/app/server/src/lib/compiler/__testfixtures__/links.json
@@ -1,6 +1,5 @@
 {
   "title": "Welcome",
-  "addons": ["links"],
   "stories": [
     {
       "name": "Welcome",
diff --git a/app/server/src/lib/compiler/__testfixtures__/links.snapshot b/app/server/src/lib/compiler/__testfixtures__/links.snapshot
index b4c137add59..70dda862c9a 100644
--- a/app/server/src/lib/compiler/__testfixtures__/links.snapshot
+++ b/app/server/src/lib/compiler/__testfixtures__/links.snapshot
@@ -1,13 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`json-to-csf-compiler links.json 1`] = `
-"import { withLinks } from '@storybook/addon-links';
-
+"
 export default {
   title: 'Welcome',
-  decorators: [
-    withLinks
-  ],
 };
 
 export const Welcome = () => {};
diff --git a/examples/server-kitchen-sink/.storybook/preview.js b/examples/server-kitchen-sink/.storybook/preview.js
index 467139f265b..f26366aeffe 100644
--- a/examples/server-kitchen-sink/.storybook/preview.js
+++ b/examples/server-kitchen-sink/.storybook/preview.js
@@ -1,7 +1,7 @@
 import { addParameters, addDecorator } from '@storybook/server';
-import { withA11y } from '@storybook/addon-a11y';
+import { withLinks } from '@storybook/addon-links';
 
-addDecorator(withA11y);
+addDecorator(withLinks);
 
 const port = process.env.SERVER_PORT || 1337;
 
diff --git a/examples/server-kitchen-sink/stories/addon-a11y.stories.json b/examples/server-kitchen-sink/stories/addon-a11y.stories.json
index 24687d848bc..95db3085008 100644
--- a/examples/server-kitchen-sink/stories/addon-a11y.stories.json
+++ b/examples/server-kitchen-sink/stories/addon-a11y.stories.json
@@ -1,6 +1,5 @@
 {
   "title": "Addons/a11y",
-  "addons": ["a11y"],
   "parameters": {
     "options": { "selectedPanel": "storybook/a11y/panel" }
   },
diff --git a/examples/server-kitchen-sink/stories/kitchen_sink.stories.json b/examples/server-kitchen-sink/stories/kitchen_sink.stories.json
index 528bdec0a40..1f5644d9c1a 100644
--- a/examples/server-kitchen-sink/stories/kitchen_sink.stories.json
+++ b/examples/server-kitchen-sink/stories/kitchen_sink.stories.json
@@ -1,6 +1,6 @@
 {
   "title": "Kitchen Sink",
-  "addons": ["a11y", "knobs", "actions", "links"],
+  "addons": ["knobs", "actions"],
   "parameters": {
     "backgrounds": [
       { "name": "light", "value": "#eeeeee" },
diff --git a/examples/server-kitchen-sink/stories/welcome.stories.json b/examples/server-kitchen-sink/stories/welcome.stories.json
index 4c1974ae191..ee192f0bec8 100644
--- a/examples/server-kitchen-sink/stories/welcome.stories.json
+++ b/examples/server-kitchen-sink/stories/welcome.stories.json
@@ -1,6 +1,5 @@
 {
   "title": "Welcome",
-  "addons": ["links"],
   "stories": [
     {
       "name": "Welcome",