diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
index 9bb4c61294..b0c1967678 100644
--- a/packages/react-dom/src/__tests__/ReactServerRendering-test.js
+++ b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
@@ -372,6 +372,22 @@ describe('ReactDOMServer', () => {
expect(element.firstChild.focus).not.toHaveBeenCalled();
});
+ it('should not focus on either server or client with autofocus={false} even if the markup is mismatch', () => {
+ spyOnDev(console, 'error');
+
+ var element = document.createElement('div');
+ element.innerHTML = ReactDOMServer.renderToString(
+ ,
+ );
+ expect(element.firstChild.autofocus).toBe(false);
+
+ element.firstChild.focus = jest.fn();
+ ReactDOM.hydrate(, element);
+
+ expect(element.firstChild.focus).not.toHaveBeenCalled();
+ expect(console.error.calls.count()).toBe(1);
+ });
+
it('should throw with silly args', () => {
expect(
ReactDOMServer.renderToString.bind(ReactDOMServer, {x: 123}),