diff --git a/client/coral-admin/src/components/CommentFormatter.js b/client/coral-admin/src/components/CommentFormatter.js
index 6c086b6aa..152ae8547 100644
--- a/client/coral-admin/src/components/CommentFormatter.js
+++ b/client/coral-admin/src/components/CommentFormatter.js
@@ -63,12 +63,18 @@ function markLinks(body) {
   return content;
 }
 
-function format(body, { suspectWords, bannedWords, className = 'comment' }) {
+const CommentFormatter = (
+  body,
+  suspectWords,
+  bannedWords,
+  className = 'comment',
+  ...rest
+) => {
   // Breaking the body by line break
   const textbreaks = body.split('\n');
 
   return (
-    <span className={`${className}-text`}>
+    <span className={`${className}-text`} {...rest}>
       {textbreaks.map((line, i) => {
         const content = markLinks(line).map((element, index) => {
           // Keep highlighted links.
@@ -91,14 +97,12 @@ function format(body, { suspectWords, bannedWords, className = 'comment' }) {
       })}
     </span>
   );
-}
-
-const CommentFormatter = ({ body, settings, ...rest }) => {
-  return <div {...rest}>{format(body, settings)}</div>;
 };
 
 CommentFormatter.propTypes = {
-  settings: PropTypes.object,
+  className: PropTypes.string,
+  bannedWords: PropTypes.array,
+  suspectWords: PropTypes.array,
   body: PropTypes.string,
 };
 
diff --git a/client/coral-admin/src/components/UserDetailComment.js b/client/coral-admin/src/components/UserDetailComment.js
index 669f035fe..2d98edcb3 100644
--- a/client/coral-admin/src/components/UserDetailComment.js
+++ b/client/coral-admin/src/components/UserDetailComment.js
@@ -79,12 +79,11 @@ class UserDetailComment extends React.Component {
             <div className={styles.bodyContainer}>
               <div className={styles.body}>
                 <CommentFormatter
-                  settings={{
-                    suspectWords: suspect,
-                    bannedWords: banned,
-                  }}
+                  suspectWords={suspect}
+                  bannedWords={banned}
                   body={comment.body}
-                />{' '}
+                  className="talk-admin-user-detail-comment"
+                />
                 <a
                   className={styles.external}
                   href={`${comment.asset.url}?commentId=${comment.id}`}
diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 504c3e04d..e79bbd2be 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -127,11 +127,9 @@ class Comment extends React.Component {
             <div className={styles.itemBody}>
               <div className={styles.body}>
                 <CommentFormatter
-                  settings={{
-                    suspectWords: settings.wordlist.suspect,
-                    bannedWords: settings.wordlist.banned,
-                    className: 'talk-admin-comment',
-                  }}
+                  suspectWords={settings.wordlist.suspect}
+                  bannedWords={settings.wordlist.banned}
+                  className="talk-admin-comment"
                   body={comment.body}
                 />
                 <a