diff --git a/package-lock.json b/package-lock.json
index 769a855db..54f311330 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "redux-form",
-  "version": "8.3.7",
+  "version": "8.3.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8e9447ced..61ad3e46b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redux-form",
-  "version": "8.3.9",
+  "version": "8.3.10",
   "description": "A higher order component decorator for forms using Redux and React",
   "main": "./lib/index.js",
   "module": "./es/index.js",
diff --git a/src/ConnectedFields.js b/src/ConnectedFields.js
index a9f64823b..b083088b3 100644
--- a/src/ConnectedFields.js
+++ b/src/ConnectedFields.js
@@ -46,14 +46,14 @@ export default function createConnectedFields(structure: Structure<any, any>) {
         this.onBlurFns[name] = event => this.handleBlur(name, event)
       })
 
-    UNSAFE_componentWillReceiveProps(nextProps: Props) {
+    componentDidUpdate(prevProps: Props) {
       if (
-        this.props.names !== nextProps.names &&
-        (size(this.props.names) !== size(nextProps.names) ||
-          nextProps.names.some(nextName => !this.props._fields[nextName]))
+        this.props.names !== prevProps.names &&
+        (size(this.props.names) !== size(prevProps.names) ||
+          this.props.names.some(nextName => !this.props._fields[nextName]))
       ) {
         // names has changed. The cached event handlers need to be updated
-        this.prepareEventHandlers(nextProps)
+        this.prepareEventHandlers(this.props)
       }
     }
 
diff --git a/src/createFields.js b/src/createFields.js
index d4030439a..736a319bb 100644
--- a/src/createFields.js
+++ b/src/createFields.js
@@ -68,8 +68,8 @@ export default function createFields(structure: Structure<any, any>) {
       this.registerFields(this.props.names)
     }
 
-    UNSAFE_componentWillReceiveProps(nextProps: Props) {
-      if (!plain.deepEqual(this.props.names, nextProps.names)) {
+    componentDidUpdate(prevProps: Props) {
+      if (!plain.deepEqual(this.props.names, prevProps.names)) {
         const { props } = this
         const { unregister } = props._reduxForm
         // unregister old name
diff --git a/src/createFormValues.js b/src/createFormValues.js
index 1b2fdae9d..beec66bcf 100644
--- a/src/createFormValues.js
+++ b/src/createFormValues.js
@@ -27,9 +27,9 @@ export default function createValues({ getIn }: Structure<any, any>): FormValues
           this.updateComponent(props)
         }
 
-        UNSAFE_componentWillReceiveProps(props) {
+        componentDidUpdate() {
           if (typeof firstArg === 'function') {
-            this.updateComponent(props)
+            this.updateComponent(this.props)
           }
         }