diff --git a/frontend/apps/remark42/app/components/comment-form/comment-form.tsx b/frontend/apps/remark42/app/components/comment-form/comment-form.tsx
index b30efd87d3..f0ec23b641 100644
--- a/frontend/apps/remark42/app/components/comment-form/comment-form.tsx
+++ b/frontend/apps/remark42/app/components/comment-form/comment-form.tsx
@@ -515,9 +515,7 @@ export class CommentForm extends Component<Props, State> {
           !!preview && (
             <div className="comment-form__preview-wrapper">
               <div
-                className={b('comment-form__preview', {
-                  mix: b('raw-content', {}, { theme }),
-                })}
+                className="comment-form__preview raw-content"
                 // eslint-disable-next-line react/no-danger
                 dangerouslySetInnerHTML={{ __html: preview }}
               />
diff --git a/frontend/apps/remark42/app/components/comment/comment.tsx b/frontend/apps/remark42/app/components/comment/comment.tsx
index 3bd279dc52..ac2081ec4a 100644
--- a/frontend/apps/remark42/app/components/comment/comment.tsx
+++ b/frontend/apps/remark42/app/components/comment/comment.tsx
@@ -354,7 +354,7 @@ export class Comment extends Component<CommentProps, State> {
               )}
             </div>{' '}
             <div
-              className={b('comment__text', { mix: b('raw-content', {}, { theme: props.theme }) })}
+              className="comment__text raw-content"
               // eslint-disable-next-line react/no-danger
               dangerouslySetInnerHTML={{ __html: o.text }}
             />
@@ -473,7 +473,7 @@ export class Comment extends Component<CommentProps, State> {
         <div className="comment__body">
           {(!props.collapsed || props.view === 'pinned') && (
             <div
-              className={b('comment__text', { mix: b('raw-content', {}, { theme: props.theme }) })}
+              className="comment__text raw-content"
               ref={this.textNode}
               // eslint-disable-next-line react/no-danger
               dangerouslySetInnerHTML={{ __html: o.text }}