diff --git a/babel.config.js b/babel.config.js
index 374124c5410555..49cdb85a4e57f6 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -131,7 +131,7 @@ module.exports = {
         [
           'transform-react-remove-prop-types',
           {
-            mode: 'wrap',
+            mode: 'unsafe-wrap',
           },
         ],
       ],
@@ -147,7 +147,7 @@ module.exports = {
         [
           'transform-react-remove-prop-types',
           {
-            mode: 'wrap',
+            mode: 'unsafe-wrap',
           },
         ],
       ],
@@ -163,7 +163,7 @@ module.exports = {
         [
           'transform-react-remove-prop-types',
           {
-            mode: 'wrap',
+            mode: 'unsafe-wrap',
           },
         ],
       ],
diff --git a/packages/material-ui-docs/src/NProgressBar/NProgressBar.js b/packages/material-ui-docs/src/NProgressBar/NProgressBar.js
index 1be78b9e0b7dda..d0ba9df5390796 100644
--- a/packages/material-ui-docs/src/NProgressBar/NProgressBar.js
+++ b/packages/material-ui-docs/src/NProgressBar/NProgressBar.js
@@ -97,7 +97,9 @@ NProgressBar.propTypes = {
   children: PropTypes.node,
 };
 
-NProgressBar.propTypes = exactProp(NProgressBar.propTypes, 'NProgressBar');
+if (process.env.NODE_ENV !== 'production') {
+  NProgressBar.propTypes = exactProp(NProgressBar.propTypes);
+}
 
 NProgressBar.defaultProps = {
   children: null,
diff --git a/packages/material-ui-styles/src/StylesProvider.js b/packages/material-ui-styles/src/StylesProvider.js
index b32cf451d08889..16b08d57cc925b 100644
--- a/packages/material-ui-styles/src/StylesProvider.js
+++ b/packages/material-ui-styles/src/StylesProvider.js
@@ -88,7 +88,9 @@ StylesProvider.propTypes = {
   sheetsRegistry: PropTypes.object,
 };
 
-StylesProvider.propTypes = exactProp(StylesProvider.propTypes);
+if (process.env.NODE_ENV !== 'production') {
+  StylesProvider.propTypes = exactProp(StylesProvider.propTypes);
+}
 
 StylesProvider.defaultProps = {
   disableGeneration: false,
diff --git a/packages/material-ui-styles/src/ThemeProvider.js b/packages/material-ui-styles/src/ThemeProvider.js
index 5c569ccd00113a..7c9b980df027bb 100644
--- a/packages/material-ui-styles/src/ThemeProvider.js
+++ b/packages/material-ui-styles/src/ThemeProvider.js
@@ -71,6 +71,8 @@ ThemeProvider.propTypes = {
   theme: PropTypes.oneOfType([PropTypes.object, PropTypes.func]).isRequired,
 };
 
-ThemeProvider.propTypes = exactProp(ThemeProvider.propTypes);
+if (process.env.NODE_ENV !== 'production') {
+  ThemeProvider.propTypes = exactProp(ThemeProvider.propTypes);
+}
 
 export default ThemeProvider;
diff --git a/packages/material-ui/src/CssBaseline/CssBaseline.js b/packages/material-ui/src/CssBaseline/CssBaseline.js
index b5a683b0c6be6d..2f4b4620f59efc 100644
--- a/packages/material-ui/src/CssBaseline/CssBaseline.js
+++ b/packages/material-ui/src/CssBaseline/CssBaseline.js
@@ -48,7 +48,9 @@ CssBaseline.propTypes = {
   classes: PropTypes.object.isRequired,
 };
 
-CssBaseline.propTypes = exactProp(CssBaseline.propTypes);
+if (process.env.NODE_ENV !== 'production') {
+  CssBaseline.propTypes = exactProp(CssBaseline.propTypes);
+}
 
 CssBaseline.defaultProps = {
   children: null,
diff --git a/packages/material-ui/src/Hidden/HiddenJs.js b/packages/material-ui/src/Hidden/HiddenJs.js
index af3e72d3a8a2cc..d00d759215e9a3 100644
--- a/packages/material-ui/src/Hidden/HiddenJs.js
+++ b/packages/material-ui/src/Hidden/HiddenJs.js
@@ -130,6 +130,8 @@ HiddenJs.propTypes = {
   xsUp: PropTypes.bool,
 };
 
-HiddenJs.propTypes = exactProp(HiddenJs.propTypes);
+if (process.env.NODE_ENV !== 'production') {
+  HiddenJs.propTypes = exactProp(HiddenJs.propTypes);
+}
 
 export default withWidth()(HiddenJs);
diff --git a/packages/material-ui/src/NoSsr/NoSsr.js b/packages/material-ui/src/NoSsr/NoSsr.js
index e3ac68fabb5a2b..72d6f35c8a46d8 100644
--- a/packages/material-ui/src/NoSsr/NoSsr.js
+++ b/packages/material-ui/src/NoSsr/NoSsr.js
@@ -62,7 +62,9 @@ NoSsr.propTypes = {
   fallback: PropTypes.node,
 };
 
-NoSsr.propTypes = exactProp(NoSsr.propTypes);
+if (process.env.NODE_ENV !== 'production') {
+  NoSsr.propTypes = exactProp(NoSsr.propTypes);
+}
 
 NoSsr.defaultProps = {
   defer: false,
diff --git a/packages/material-ui/src/Portal/Portal.js b/packages/material-ui/src/Portal/Portal.js
index c3eca567a68391..fe1bf1e72041f8 100644
--- a/packages/material-ui/src/Portal/Portal.js
+++ b/packages/material-ui/src/Portal/Portal.js
@@ -99,6 +99,8 @@ Portal.defaultProps = {
   disablePortal: false,
 };
 
-Portal.propTypes = exactProp(Portal.propTypes);
+if (process.env.NODE_ENV !== 'production') {
+  Portal.propTypes = exactProp(Portal.propTypes);
+}
 
 export default Portal;
diff --git a/packages/material-ui/src/RootRef/RootRef.js b/packages/material-ui/src/RootRef/RootRef.js
index 5286c230fa37b7..281b27923a0604 100644
--- a/packages/material-ui/src/RootRef/RootRef.js
+++ b/packages/material-ui/src/RootRef/RootRef.js
@@ -75,6 +75,8 @@ RootRef.propTypes = {
   rootRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).isRequired,
 };
 
-RootRef.propTypes = exactProp(RootRef.propTypes);
+if (process.env.NODE_ENV !== 'production') {
+  RootRef.propTypes = exactProp(RootRef.propTypes);
+}
 
 export default RootRef;
diff --git a/packages/material-ui/src/styles/MuiThemeProvider.js b/packages/material-ui/src/styles/MuiThemeProvider.js
index cfd53aa1ec919d..c71086c89ab622 100644
--- a/packages/material-ui/src/styles/MuiThemeProvider.js
+++ b/packages/material-ui/src/styles/MuiThemeProvider.js
@@ -139,7 +139,9 @@ MuiThemeProviderOld.propTypes = {
   theme: PropTypes.oneOfType([PropTypes.object, PropTypes.func]).isRequired,
 };
 
-MuiThemeProviderOld.propTypes = exactProp(MuiThemeProviderOld.propTypes);
+if (process.env.NODE_ENV !== 'production') {
+  MuiThemeProviderOld.propTypes = exactProp(MuiThemeProviderOld.propTypes);
+}
 
 MuiThemeProviderOld.childContextTypes = {
   ...themeListener.contextTypes,