diff --git a/src/component/contents/DraftEditorBlock.react.js b/src/component/contents/DraftEditorBlock.react.js
index 5f04540330..a46776ec31 100644
--- a/src/component/contents/DraftEditorBlock.react.js
+++ b/src/component/contents/DraftEditorBlock.react.js
@@ -213,7 +213,6 @@ class DraftEditorBlock extends React.Component<Props> {
           contentState: this.props.contentState,
           decoratedText,
           dir: dir,
-          key: decoratorOffsetKey,
           start,
           end,
           blockKey,
@@ -222,7 +221,10 @@ class DraftEditorBlock extends React.Component<Props> {
         };
 
         return (
-          <DecoratorComponent {...decoratorProps} {...commonProps}>
+          <DecoratorComponent
+            {...decoratorProps}
+            {...commonProps}
+            key={decoratorOffsetKey}>
             {leaves}
           </DecoratorComponent>
         );
diff --git a/src/model/decorators/DraftDecorator.js b/src/model/decorators/DraftDecorator.js
index c4f124d4a4..75ead518d8 100644
--- a/src/model/decorators/DraftDecorator.js
+++ b/src/model/decorators/DraftDecorator.js
@@ -66,7 +66,6 @@ export type DraftDecoratorComponentProps = {
   // undefined. That's why `getEntityKeyAt()` is typed to return `?string`.
   // See https://github.com/facebook/draft-js/blob/2da3dcb1c4c106d1b2a0f07b3d0275b8d724e777/src/model/immutable/BlockNode.js#L51
   entityKey: ?string,
-  key: React.Key,
   offsetKey: string,
   start: number,
   ...