diff --git a/hooks/test/browser/errorBoundary.test.js b/hooks/test/browser/errorBoundary.test.js
index 0e7de2f6253..fa4c443d42b 100644
--- a/hooks/test/browser/errorBoundary.test.js
+++ b/hooks/test/browser/errorBoundary.test.js
@@ -1,6 +1,6 @@
-import { createElement, render } from 'preact';
+import { Fragment, createElement, render } from 'preact';
 import { setupScratch, teardown } from '../../../test/_util/helpers';
-import { useErrorBoundary, useLayoutEffect } from 'preact/hooks';
+import { useErrorBoundary, useLayoutEffect, useState } from 'preact/hooks';
 import { setupRerender } from 'preact/test-utils';
 
 /** @jsx createElement */
diff --git a/test/browser/render.test.js b/test/browser/render.test.js
index 6dab0019ab5..4367681d91f 100644
--- a/test/browser/render.test.js
+++ b/test/browser/render.test.js
@@ -1,5 +1,5 @@
 import { setupRerender } from 'preact/test-utils';
-import { createElement, render, Component, options } from 'preact';
+import { createElement, render, Component, options, Fragment } from 'preact';
 import {
 	setupScratch,
 	teardown,
@@ -1061,6 +1061,91 @@ describe('render()', () => {
 		expect(scratch.textContent).to.equal('01');
 	});
 
+	it('should not remove iframe with memoized components', () => {
+		function renderLeaf(props) {
+			if (props.text === '') {
+				return null;
+			}
+
+			return <span>{props.text}</span>;
+		}
+
+		const value = [
+			{
+				id: 2,
+				type: 'paragraph',
+				children: [{ text: 'hello world.' }]
+			},
+			{
+				id: 1,
+				type: 'iframe',
+				url: 'https://codesandbox.io/embed/sweet-haze-6izou?fontsize=14&hidenavigation=1&theme=dark',
+				children: [{ text: '' }]
+			}
+		];
+
+		function renderElement(props) {
+			if (props.element.type === 'iframe') {
+				return <div id="iframe">{props.children}</div>;
+			}
+
+			return <p {...props.attributes}>{props.children}</p>;
+		}
+
+		class MemoizedComponent extends Component {
+			shouldComponentUpdate(prevProps) {
+				return prevProps.element.id !== this.props.element.id;
+			}
+
+			render() {
+				return renderElement({
+					element: this.props.element,
+					children: this.props.element.children.map(leaf => renderLeaf(leaf))
+				});
+			}
+		}
+
+		function Editor({ value }) {
+			return (
+				<Fragment>
+					{value.map(element => (
+						<MemoizedComponent
+							key={element.id}
+							element={element}
+							renderElement={renderElement}
+						/>
+					))}
+				</Fragment>
+			);
+		}
+
+		let set;
+		class Wrapper extends Component {
+			constructor(props) {
+				super(props);
+				this.state = { value };
+				set = this.setState.bind(this);
+			}
+
+			render() {
+				return <Editor value={this.state.value} />;
+			}
+		}
+
+		render(<Wrapper />, scratch);
+
+		expect(scratch.innerHTML).to.equal(
+			'<p><span>hello world.</span></p><div id="iframe"></div>'
+		);
+
+		clearLog();
+		set({ value: value.filter((_, index) => index !== 0) });
+		rerender();
+
+		expect(scratch.innerHTML).to.equal('<div id="iframe"></div>');
+		expect(getLog()).to.deep.equal(['<p>hello world..remove()']);
+	});
+
 	it('should not remove iframe', () => {
 		let setState;
 		const Iframe = () => {