diff --git a/src/components/views/messages/ReactionsRowButtonTooltip.js b/src/components/views/messages/ReactionsRowButtonTooltip.js
index 4f26cea708..e9ec58e8d0 100644
--- a/src/components/views/messages/ReactionsRowButtonTooltip.js
+++ b/src/components/views/messages/ReactionsRowButtonTooltip.js
@@ -21,6 +21,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
 import sdk from '../../../index';
 import { unicodeToShort } from '../../../HtmlUtils';
 import { _t } from '../../../languageHandler';
+import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
 
 export default class ReactionsRowButtonTooltip extends React.PureComponent {
     static propTypes = {
@@ -54,7 +55,7 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent {
                 {
                     reactors: () => {
                         return <div className="mx_ReactionsRowButtonTooltip_senders">
-                            {senders.join(", ")}
+                            {formatCommaSeparatedList(senders, 6)}
                         </div>;
                     },
                     reactedWith: (sub) => {