diff --git a/src/diff/index.js b/src/diff/index.js
index decdc225916..e81fa0f9e34 100644
--- a/src/diff/index.js
+++ b/src/diff/index.js
@@ -110,8 +110,8 @@ export function diff(
 			oldProps = c.props;
 			oldState = c.state;
 
-			if (c._stateCallbacks.length) {
-				c._renderCallbacks.push(...c._stateCallbacks);
+			for (tmp = 0; tmp < c._stateCallbacks.length; tmp++) {
+				c._renderCallbacks.push(c._stateCallbacks[tmp]);
 				c._stateCallbacks = [];
 			}
 
diff --git a/test/browser/lifecycles/componentDidUpdate.test.js b/test/browser/lifecycles/componentDidUpdate.test.js
index b3c7c860dac..41bae1bf50c 100644
--- a/test/browser/lifecycles/componentDidUpdate.test.js
+++ b/test/browser/lifecycles/componentDidUpdate.test.js
@@ -404,6 +404,7 @@ describe('Lifecycle methods', () => {
 				}
 
 				componentDidMount() {
+					// eslint-disable-next-line
 					this.setState({ show: true });
 				}