diff --git a/src/core/client/stream/test/__snapshots__/postComment.spec.tsx.snap b/src/core/client/stream/test/__snapshots__/postComment.spec.tsx.snap
index 1265c8b00..f4dae1d35 100644
--- a/src/core/client/stream/test/__snapshots__/postComment.spec.tsx.snap
+++ b/src/core/client/stream/test/__snapshots__/postComment.spec.tsx.snap
@@ -70,7 +70,7 @@ exports[`post a comment: optimistic response 1`] = `
                 className=""
               >
                 <div
-                  className="Toolbar-toolbar"
+                  className=" RTE-toolbarDisabled Toolbar-toolbar"
                 >
                   <button
                     className="Button-button"
@@ -117,13 +117,14 @@ exports[`post a comment: optimistic response 1`] = `
                 </div>
                 <div
                   aria-placeholder="Post a comment"
-                  className="RTE-contentEditable RTE-content"
-                  contentEditable={true}
+                  className="RTE-contentEditable RTE-content  RTE-contentEditableDisabled"
+                  contentEditable={false}
                   dangerouslySetInnerHTML={
                     Object {
                       "__html": "<strong>Hello world!</strong>",
                     }
                   }
+                  disabled={true}
                   id="comments-postCommentForm-field"
                   onBlur={[Function]}
                   onChange={[Function]}
@@ -471,6 +472,7 @@ exports[`post a comment: server response 1`] = `
                       "__html": "",
                     }
                   }
+                  disabled={false}
                   id="comments-postCommentForm-field"
                   onBlur={[Function]}
                   onChange={[Function]}
@@ -818,6 +820,7 @@ exports[`renders comment stream 1`] = `
                       "__html": "",
                     }
                   }
+                  disabled={false}
                   id="comments-postCommentForm-field"
                   onBlur={[Function]}
                   onChange={[Function]}
diff --git a/src/core/client/stream/test/__snapshots__/postReply.spec.tsx.snap b/src/core/client/stream/test/__snapshots__/postReply.spec.tsx.snap
index 446daed79..0e6c5d219 100644
--- a/src/core/client/stream/test/__snapshots__/postReply.spec.tsx.snap
+++ b/src/core/client/stream/test/__snapshots__/postReply.spec.tsx.snap
@@ -130,6 +130,7 @@ exports[`post a reply: open reply form 1`] = `
                       "__html": "",
                     }
                   }
+                  disabled={false}
                   id="comments-postCommentForm-field"
                   onBlur={[Function]}
                   onChange={[Function]}
@@ -315,6 +316,7 @@ exports[`post a reply: open reply form 1`] = `
                         "__html": "",
                       }
                     }
+                    disabled={false}
                     id="comments-replyCommentForm-rte-comment-0"
                     onBlur={[Function]}
                     onChange={[Function]}
@@ -550,6 +552,7 @@ exports[`post a reply: optimistic response 1`] = `
                       "__html": "",
                     }
                   }
+                  disabled={false}
                   id="comments-postCommentForm-field"
                   onBlur={[Function]}
                   onChange={[Function]}
@@ -675,7 +678,7 @@ exports[`post a reply: optimistic response 1`] = `
                   className=""
                 >
                   <div
-                    className="Toolbar-toolbar"
+                    className=" RTE-toolbarDisabled Toolbar-toolbar"
                   >
                     <button
                       className="Button-button"
@@ -722,13 +725,14 @@ exports[`post a reply: optimistic response 1`] = `
                   </div>
                   <div
                     aria-placeholder="Post a comment"
-                    className="RTE-contentEditable RTE-content"
-                    contentEditable={true}
+                    className="RTE-contentEditable RTE-content  RTE-contentEditableDisabled"
+                    contentEditable={false}
                     dangerouslySetInnerHTML={
                       Object {
                         "__html": "<strong>Hello world!</strong>",
                       }
                     }
+                    disabled={true}
                     id="comments-replyCommentForm-rte-comment-0"
                     onBlur={[Function]}
                     onChange={[Function]}
@@ -1023,6 +1027,7 @@ exports[`post a reply: server response 1`] = `
                       "__html": "",
                     }
                   }
+                  disabled={false}
                   id="comments-postCommentForm-field"
                   onBlur={[Function]}
                   onChange={[Function]}
@@ -1376,6 +1381,7 @@ exports[`renders comment stream 1`] = `
                       "__html": "",
                     }
                   }
+                  disabled={false}
                   id="comments-postCommentForm-field"
                   onBlur={[Function]}
                   onChange={[Function]}