diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c171a7a13..ad5ac66e99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ Notable changes to Draft.js will be documented in this file.
 
 Changes to `src` are live in production on facebook.com at the time of release.
 
+## 0.11.8-rc.1 (Jun 26th, 2021)
+
+### Changed
+* [[`5dfe40d3d4`](https://github.com/twreporter/draft-js/commit/5dfe40d3d4)] - **fix**: add key prop to child component rather than the block (Tai-Jiun Fang)
+
 ## 0.11.8-rc.0 (Jun 10th, 2021)
 
 ### Added
diff --git a/package.json b/package.json
index 10c3411b42..412a218717 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@twreporter/draft-js",
   "description": "A React framework for building text editors.",
-  "version": "0.11.8-rc.0",
+  "version": "0.11.8-rc.1",
   "keywords": [
     "draftjs",
     "editor",
diff --git a/src/component/contents/DraftEditorContents-core.react.js b/src/component/contents/DraftEditorContents-core.react.js
index 6cc30f3439..1b67a85f0a 100644
--- a/src/component/contents/DraftEditorContents-core.react.js
+++ b/src/component/contents/DraftEditorContents-core.react.js
@@ -192,7 +192,6 @@ class DraftEditorContents extends React.Component<Props> {
         preventScroll,
         selection,
         tree: editorState.getBlockTree(key),
-        key: `${key}-${blockKeyMap.get(key) || '0'}`,
       };
 
       const configForType =
@@ -230,8 +229,9 @@ class DraftEditorContents extends React.Component<Props> {
         'data-block': true,
         'data-editor': editorKey,
         'data-offset-key': offsetKey,
-        key,
+        key: `${key}-${blockKeyMap.get(key) || '0'}` ,
       };
+
       if (customEditable !== undefined) {
         childProps = {
           ...childProps,