diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index a8fc7dce3a..66cd89f4ab 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../../languageHandler';
 
 import Modal from '../../../../Modal';
-import {formatBytes, formatCount} from "../../../../utils/FormattingUtils";
+import {formatBytes, formatCountLong} from "../../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
 
@@ -125,8 +125,8 @@ export default class ManageEventIndexDialog extends React.Component {
                 }
                 <div className='mx_SettingsTab_subsectionText'>
                     {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
-                    {_t("Indexed messages:")} {formatCount(this.state.eventCount)}<br />
-                    {_t("Number of rooms:")} {formatCount(this.state.roomCount)}<br />
+                    {_t("Indexed messages:")} {formatCountLong(this.state.eventCount)}<br />
+                    {_t("Number of rooms:")} {formatCountLong(this.state.roomCount)}<br />
                     {crawlerState}<br />
                 </div>
             </div>
diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 321f45699b..851f86f3d4 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -21,7 +21,7 @@ import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
-import {formatBytes, formatCount} from "../../../utils/FormattingUtils";
+import {formatBytes, formatCountLong} from "../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../indexing/EventIndexPeg";
 
 export default class EventIndexPanel extends React.Component {
@@ -115,7 +115,8 @@ export default class EventIndexPanel extends React.Component {
                         {_t( "Securely cache encrypted messages locally for them " +
                              "to appear in search results, using ")
                         } {formatBytes(this.state.eventIndexSize, 0)}
-                        {_t( " to store messages from ")} {formatCount(this.state.roomCount)} {_t("rooms.")}
+                        {_t( " to store messages from ")}
+                        {formatCountLong(this.state.roomCount)} {_t("rooms.")}
                     </div>
                     <div>
                         <AccessibleButton kind="primary" onClick={this._onManage}>