diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js
index dc69ea3f8..5adc25097 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-settings/containers/ProfileContainer.js
@@ -71,24 +71,23 @@ class ProfileContainer extends Component {
     const emailAddress = localProfile && localProfile.id;
 
     return (
-      <div className={cn('talk-my-profile-comment-history', {
-        'talk-my-profile-comment-history-no-comments': !me.comments.nodes.length
-      })}>
+      <div className="talk-my-profile">
         <h2>{user.username}</h2>
-        {emailAddress ? <p>{emailAddress}</p> : null}
-
+        {emailAddress && <p>{emailAddress}</p>}
         <Slot
           fill="profileSections"
           data={data}
           queryData={{root}}
         />
-
         <hr />
-
         <h3>{t('framework.my_comments')}</h3>
-        {me.comments.nodes.length
-          ? <CommentHistory data={data} root={root} comments={me.comments} link={link} loadMore={this.loadMore}/>
-          : <p className='talk-my-profile-comment-history-no-comments-cta'>{t('user_no_comment')}</p>}
+        <div className={cn('talk-my-profile-comment-history', {
+          'talk-my-profile-comment-history-no-comments': !me.comments.nodes.length
+        })}>
+          {me.comments.nodes.length
+            ? <CommentHistory data={data} root={root} comments={me.comments} link={link} loadMore={this.loadMore}/>
+            : <p className='talk-my-profile-comment-history-no-comments-cta'>{t('user_no_comment')}</p>}
+        </div>
       </div>
     );
   }
diff --git a/client/talk-plugin-history/CommentHistory.css b/client/talk-plugin-history/CommentHistory.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/client/talk-plugin-history/CommentHistory.js b/client/talk-plugin-history/CommentHistory.js
index 2e6f627e7..c64e5419b 100644
--- a/client/talk-plugin-history/CommentHistory.js
+++ b/client/talk-plugin-history/CommentHistory.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Comment from './Comment';
-import styles from './CommentHistory.css';
 import LoadMore from './LoadMore';
 import {forEachError} from 'plugin-api/beta/client/utils';
 
@@ -25,7 +24,7 @@ class CommentHistory extends React.Component {
   render() {
     const {link, comments, data, root} = this.props;
     return (
-      <div className={`${styles.header} commentHistory`}>
+      <div>
         <div className="commentHistory__list">
           {comments.nodes.map((comment, i) => {
             return <Comment
@@ -49,7 +48,12 @@ class CommentHistory extends React.Component {
 }
 
 CommentHistory.propTypes = {
-  comments: PropTypes.object.isRequired
+  comments: PropTypes.object.isRequired,
+  loadMore: PropTypes.func,
+  notify: PropTypes.func,
+  link: PropTypes.func,
+  data: PropTypes.object,
+  root: PropTypes.object
 };
 
 export default CommentHistory;