diff --git a/docs/change-log.md b/docs/change-log.md
index a5a53a20..e2aaecdf 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -59,6 +59,8 @@
 - render/events: Event handlers, when set to literally `undefined` (or any non-function), are now correctly removed.
 - render/hooks: fixed an ommission that caused `oninit` to be called unnecessarily in some cases [#1992](https://github.com/MithrilJS/mithril.js/issues/1992)
 - docs: tweaks: ([#2104](https://github.com/MithrilJS/mithril.js/pull/2104) [@mikeyb](https://github.com/mikeyb), [#2205](https://github.com/MithrilJS/mithril.js/pull/2205), [@cavemansspa](https://github.com/cavemansspa))
+- render/core: avoid touching `Object.prototype.__proto__` setter with `key: "__proto__"` in certain situations ([#2251](https://github.com/MithrilJS/mithril.js/pull/2251))
+
 ---
 
 ### v1.1.7
diff --git a/render/render.js b/render/render.js
index 260a7766..9d4f1cf4 100644
--- a/render/render.js
+++ b/render/render.js
@@ -521,7 +521,7 @@ module.exports = function($window) {
 		}
 	}
 	function getKeyMap(vnodes, start, end) {
-		var map = {}
+		var map = Object.create(null)
 		for (; start < end; start++) {
 			var vnode = vnodes[start]
 			if (vnode != null) {
diff --git a/render/tests/test-updateNodes.js b/render/tests/test-updateNodes.js
index d464eda9..3fffaaf3 100644
--- a/render/tests/test-updateNodes.js
+++ b/render/tests/test-updateNodes.js
@@ -264,6 +264,21 @@ o.spec("updateNodes", function() {
 		o(updated[2].dom.nodeName).equals("S")
 		o(updated[2].dom).equals(root.childNodes[2])
 	})
+	o("creates, deletes, reverses els at same time with '__proto__' key", function() {
+		var vnodes = [{tag: "a", key: "__proto__"}, {tag: "i", key: 3}, {tag: "b", key: 2}]
+		var updated = [{tag: "b", key: 2}, {tag: "a", key: "__proto__"}, {tag: "s", key: 4}]
+
+		render(root, vnodes)
+		render(root, updated)
+
+		o(root.childNodes.length).equals(3)
+		o(updated[0].dom.nodeName).equals("B")
+		o(updated[0].dom).equals(root.childNodes[0])
+		o(updated[1].dom.nodeName).equals("A")
+		o(updated[1].dom).equals(root.childNodes[1])
+		o(updated[2].dom.nodeName).equals("S")
+		o(updated[2].dom).equals(root.childNodes[2])
+	})
 	o("adds to empty array followed by el", function() {
 		var vnodes = [{tag: "[", key: 1, children: []}, {tag: "b", key: 2}]
 		var updated = [{tag: "[", key: 1, children: [{tag: "a"}]}, {tag: "b", key: 2}]
@@ -1242,7 +1257,7 @@ o.spec("updateNodes", function() {
 		o(root.appendChild.callCount + root.insertBefore.callCount).equals(5)
 		o(tagNames).deepEquals(expectedTagNames)
 	})
-	
+
 	components.forEach(function(cmp){
 		o.spec(cmp.kind, function(){
 			var createComponent = cmp.create