diff --git a/addons/actions/package.json b/addons/actions/package.json
index fa8cd761624b..35212aa2440f 100644
--- a/addons/actions/package.json
+++ b/addons/actions/package.json
@@ -40,7 +40,7 @@
     "lodash": "^4.17.15",
     "polished": "^3.4.4",
     "prop-types": "^15.7.2",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-inspector": "^5.0.1",
     "regenerator-runtime": "^0.13.3",
     "ts-dedent": "^1.1.1",
diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
index 0b036dcf52f5..c041ccbe41ba 100644
--- a/addons/backgrounds/package.json
+++ b/addons/backgrounds/package.json
@@ -40,7 +40,7 @@
     "@storybook/theming": "6.0.27",
     "core-js": "^3.0.1",
     "memoizerific": "^1.11.3",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "regenerator-runtime": "^0.13.3"
   },
   "devDependencies": {
diff --git a/addons/cssresources/package.json b/addons/cssresources/package.json
index 43cb312e60f7..cec753924bbe 100644
--- a/addons/cssresources/package.json
+++ b/addons/cssresources/package.json
@@ -39,7 +39,7 @@
     "@storybook/theming": "6.0.27",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "regenerator-runtime": "^0.13.3"
   },
   "devDependencies": {
diff --git a/addons/design-assets/package.json b/addons/design-assets/package.json
index bce63a7c69b9..d6ff62761160 100644
--- a/addons/design-assets/package.json
+++ b/addons/design-assets/package.json
@@ -42,7 +42,7 @@
     "@storybook/theming": "6.0.27",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "regenerator-runtime": "^0.13.3",
     "ts-dedent": "^1.1.1",
     "use-image": "^1.0.3"
diff --git a/addons/docs/package.json b/addons/docs/package.json
index 35dfb7cfa490..344918470c8e 100644
--- a/addons/docs/package.json
+++ b/addons/docs/package.json
@@ -103,7 +103,7 @@
     "lit-element": "^2.2.1",
     "lit-html": "^1.0.0",
     "prettier": "~2.0.5",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3",
     "react-is": "^16.12.0",
     "require-from-string": "^2.0.2",
diff --git a/addons/events/package.json b/addons/events/package.json
index de1e9c45229b..698b099c8082 100644
--- a/addons/events/package.json
+++ b/addons/events/package.json
@@ -40,7 +40,7 @@
     "format-json": "^1.0.3",
     "lodash": "^4.17.15",
     "prop-types": "^15.7.2",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-lifecycles-compat": "^3.0.4",
     "react-textarea-autosize": "^8.1.1",
     "regenerator-runtime": "^0.13.3"
diff --git a/addons/jest/package.json b/addons/jest/package.json
index 9e693a68d9af..19d222d0f2aa 100644
--- a/addons/jest/package.json
+++ b/addons/jest/package.json
@@ -42,7 +42,7 @@
     "@storybook/theming": "6.0.27",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-sizeme": "^2.5.2",
     "regenerator-runtime": "^0.13.3",
     "upath": "^1.1.0"
diff --git a/addons/queryparams/package.json b/addons/queryparams/package.json
index 00db1d758d03..7c9a716d29dd 100644
--- a/addons/queryparams/package.json
+++ b/addons/queryparams/package.json
@@ -39,7 +39,7 @@
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "qs": "^6.6.0",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "regenerator-runtime": "^0.13.3",
     "ts-dedent": "^1.1.1"
   },
diff --git a/addons/storyshots/storyshots-core/package.json b/addons/storyshots/storyshots-core/package.json
index dedda17ee51b..3f8a4660e868 100644
--- a/addons/storyshots/storyshots-core/package.json
+++ b/addons/storyshots/storyshots-core/package.json
@@ -56,7 +56,7 @@
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.4.1",
     "jest-emotion": "^10.0.17",
-    "react": "^16.8.3"
+    "react": "^16.8.3 || ^17.0.0"
   },
   "peerDependencies": {
     "react-dom": "*"
diff --git a/dev-kits/addon-parameter/package.json b/dev-kits/addon-parameter/package.json
index f40bf1ed54f6..7466e98f170b 100644
--- a/dev-kits/addon-parameter/package.json
+++ b/dev-kits/addon-parameter/package.json
@@ -32,7 +32,7 @@
     "@storybook/theming": "6.0.27",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "ts-dedent": "^1.1.1"
   },
   "publishConfig": {
diff --git a/dev-kits/addon-preview-wrapper/package.json b/dev-kits/addon-preview-wrapper/package.json
index 6b279358b0ef..a97f1a83f1cd 100644
--- a/dev-kits/addon-preview-wrapper/package.json
+++ b/dev-kits/addon-preview-wrapper/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@storybook/addons": "6.0.27",
-    "react": "^16.8.3"
+    "react": "^16.8.3 || ^17.0.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/dev-kits/addon-roundtrip/package.json b/dev-kits/addon-roundtrip/package.json
index 8612cd46e134..43919927fb17 100644
--- a/dev-kits/addon-roundtrip/package.json
+++ b/dev-kits/addon-roundtrip/package.json
@@ -33,7 +33,7 @@
     "@storybook/theming": "6.0.27",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "ts-dedent": "^1.1.1"
   },
   "publishConfig": {
diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json
index 0dbcb921793f..2704a88a1cf8 100644
--- a/examples/cra-kitchen-sink/package.json
+++ b/examples/cra-kitchen-sink/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "global": "^4.3.2",
     "prop-types": "^15.7.2",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3",
     "react-lifecycles-compat": "^3.0.4"
   },
diff --git a/examples/dev-kits/package.json b/examples/dev-kits/package.json
index b2a3a8424a8c..dcef532df617 100644
--- a/examples/dev-kits/package.json
+++ b/examples/dev-kits/package.json
@@ -32,7 +32,7 @@
     "jest-emotion": "^10.0.17",
     "paths.macro": "^2.0.2",
     "prop-types": "^15.7.2",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3",
     "ts-loader": "^6.2.0",
     "uuid": "^8.0.0",
diff --git a/examples/official-storybook/package.json b/examples/official-storybook/package.json
index 97ae610c98d0..d9c70f8d7154 100644
--- a/examples/official-storybook/package.json
+++ b/examples/official-storybook/package.json
@@ -55,7 +55,7 @@
     "lodash": "^4.17.15",
     "paths.macro": "^2.0.2",
     "prop-types": "^15.7.2",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3",
     "terser-webpack-plugin": "^3.0.0",
     "ts-loader": "^6.0.0",
diff --git a/lib/api/package.json b/lib/api/package.json
index d239409d68fd..0a2693fd1686 100644
--- a/lib/api/package.json
+++ b/lib/api/package.json
@@ -42,7 +42,7 @@
     "global": "^4.3.2",
     "lodash": "^4.17.15",
     "memoizerific": "^1.11.3",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "regenerator-runtime": "^0.13.3",
     "store2": "^2.7.1",
     "telejson": "^5.0.2",
diff --git a/lib/cli/test/fixtures/react/package.json b/lib/cli/test/fixtures/react/package.json
index e9283b635e27..9ca62ba67cef 100644
--- a/lib/cli/test/fixtures/react/package.json
+++ b/lib/cli/test/fixtures/react/package.json
@@ -7,7 +7,7 @@
     "build": "rollup -c"
   },
   "dependencies": {
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3"
   },
   "devDependencies": {
diff --git a/lib/cli/test/fixtures/react_babel_config_js/package.json b/lib/cli/test/fixtures/react_babel_config_js/package.json
index 6a7d0f198c50..13fd6e3478ab 100644
--- a/lib/cli/test/fixtures/react_babel_config_js/package.json
+++ b/lib/cli/test/fixtures/react_babel_config_js/package.json
@@ -8,7 +8,7 @@
     "storybook": "start-storybook -p 6006"
   },
   "dependencies": {
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3"
   },
   "devDependencies": {
diff --git a/lib/cli/test/fixtures/react_babel_custom_preset/package.json b/lib/cli/test/fixtures/react_babel_custom_preset/package.json
index 7c72dd008c74..2dea799153e1 100644
--- a/lib/cli/test/fixtures/react_babel_custom_preset/package.json
+++ b/lib/cli/test/fixtures/react_babel_custom_preset/package.json
@@ -8,7 +8,7 @@
     "storybook": "start-storybook -p 6006"
   },
   "dependencies": {
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3"
   },
   "devDependencies": {
diff --git a/lib/cli/test/fixtures/react_babel_pkg_json/package.json b/lib/cli/test/fixtures/react_babel_pkg_json/package.json
index e22af4d88d3a..cc1e0d744996 100644
--- a/lib/cli/test/fixtures/react_babel_pkg_json/package.json
+++ b/lib/cli/test/fixtures/react_babel_pkg_json/package.json
@@ -13,7 +13,7 @@
     ]
   },
   "dependencies": {
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3"
   },
   "devDependencies": {
diff --git a/lib/cli/test/fixtures/react_babelrc/package.json b/lib/cli/test/fixtures/react_babelrc/package.json
index 37352d3c2ef1..51874c349c45 100644
--- a/lib/cli/test/fixtures/react_babelrc/package.json
+++ b/lib/cli/test/fixtures/react_babelrc/package.json
@@ -8,7 +8,7 @@
     "storybook": "start-storybook -p 6006"
   },
   "dependencies": {
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3"
   },
   "devDependencies": {
diff --git a/lib/cli/test/fixtures/react_babelrc_js/package.json b/lib/cli/test/fixtures/react_babelrc_js/package.json
index ae52d595b257..999a8dc05164 100644
--- a/lib/cli/test/fixtures/react_babelrc_js/package.json
+++ b/lib/cli/test/fixtures/react_babelrc_js/package.json
@@ -8,7 +8,7 @@
     "storybook": "start-storybook -p 6006"
   },
   "dependencies": {
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3"
   },
   "devDependencies": {
diff --git a/lib/cli/test/fixtures/react_project/package.json b/lib/cli/test/fixtures/react_project/package.json
index d130997b7c37..e877acbe3a97 100644
--- a/lib/cli/test/fixtures/react_project/package.json
+++ b/lib/cli/test/fixtures/react_project/package.json
@@ -10,7 +10,7 @@
     "@babel/cli": "^7.2.3",
     "@babel/preset-env": "^7.4.1",
     "@babel/preset-react": "7.0.0",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3"
   },
   "peerDependencies": {
diff --git a/lib/cli/test/fixtures/react_static_next/package.json b/lib/cli/test/fixtures/react_static_next/package.json
index 495f314dac77..beefd429d7b1 100644
--- a/lib/cli/test/fixtures/react_static_next/package.json
+++ b/lib/cli/test/fixtures/react_static_next/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "axios": "^0.18.0",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3",
     "react-hot-loader": "^4.7.2",
     "react-router": "^4.3.1",
diff --git a/lib/cli/test/fixtures/update_package_organisations/package.json b/lib/cli/test/fixtures/update_package_organisations/package.json
index a7bec2cadf21..b11daca3d6c8 100644
--- a/lib/cli/test/fixtures/update_package_organisations/package.json
+++ b/lib/cli/test/fixtures/update_package_organisations/package.json
@@ -11,7 +11,7 @@
     "test": "react-scripts test --env=jsdom"
   },
   "dependencies": {
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3",
     "react-scripts": "0.9.x"
   },
diff --git a/lib/cli/test/fixtures/webpack_react/package.json b/lib/cli/test/fixtures/webpack_react/package.json
index 34de2092b368..317bd47fcc07 100644
--- a/lib/cli/test/fixtures/webpack_react/package.json
+++ b/lib/cli/test/fixtures/webpack_react/package.json
@@ -7,7 +7,7 @@
     "build": "webpack"
   },
   "dependencies": {
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3"
   },
   "devDependencies": {
diff --git a/lib/components/package.json b/lib/components/package.json
index 9a509084ce15..404581e39b21 100644
--- a/lib/components/package.json
+++ b/lib/components/package.json
@@ -43,7 +43,7 @@
     "overlayscrollbars": "^1.10.2",
     "polished": "^3.4.4",
     "popper.js": "^1.14.7",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-color": "^2.17.0",
     "react-dom": "^16.8.3",
     "react-popper-tooltip": "^2.11.0",
diff --git a/lib/ui/package.json b/lib/ui/package.json
index 568083c899d3..a9222babd6fb 100644
--- a/lib/ui/package.json
+++ b/lib/ui/package.json
@@ -50,7 +50,7 @@
     "memoizerific": "^1.11.3",
     "polished": "^3.4.4",
     "qs": "^6.6.0",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3",
     "react-draggable": "^4.0.3",
     "react-helmet-async": "^1.0.2",
diff --git a/package.json b/package.json
index a53ee3d7bb63..8f01a755d029 100644
--- a/package.json
+++ b/package.json
@@ -217,7 +217,7 @@
     "p-limit": "^2.3.0",
     "prettier": "~2.0.5",
     "raf": "^3.4.0",
-    "react": "^16.8.3",
+    "react": "^16.8.3 || ^17.0.0",
     "react-dom": "^16.8.3",
     "react-test-renderer": "^16.8.3",
     "recursive-copy": "^2.0.10",
diff --git a/yarn.lock b/yarn.lock
index 5f026be787b1..3f3c8cbaf868 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -26546,7 +26546,7 @@ react@^15.4.2:
     object-assign "^4.1.0"
     prop-types "^15.5.10"
 
-react@^16.0.0, react@^16.10.2, react@^16.13.1, react@^16.8.3, react@^16.8.4, react@^16.9.17:
+react@^16.0.0, react@^16.10.2, react@^16.13.1, react@^16.8.4, react@^16.9.17:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
   integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
@@ -26555,6 +26555,14 @@ react@^16.0.0, react@^16.10.2, react@^16.13.1, react@^16.8.3, react@^16.8.4, rea
     object-assign "^4.1.1"
     prop-types "^15.6.2"
 
+"react@^16.8.3 || ^17.0.0":
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
+  integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+
 reactcss@^1.2.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"