diff --git a/src/Notifier.ts b/src/Notifier.ts
index 3e927cea0c..4f55046e72 100644
--- a/src/Notifier.ts
+++ b/src/Notifier.ts
@@ -331,6 +331,8 @@ export const Notifier = {
         if (!this.isSyncing) return; // don't alert for any messages initially
         if (ev.sender && ev.sender.userId === MatrixClientPeg.get().credentials.userId) return;
 
+        MatrixClientPeg.get().decryptEventIfNeeded(ev);
+
         // If it's an encrypted event and the type is still 'm.room.encrypted',
         // it hasn't yet been decrypted, so wait until it is.
         if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) {
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index d5e4b092e2..bb7c1f9642 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -50,6 +50,9 @@ class FilePanel extends React.Component {
         if (room?.roomId !== this.props?.roomId) return;
         if (toStartOfTimeline || !data || !data.liveEvent || ev.isRedacted()) return;
 
+        const client = MatrixClientPeg.get();
+        client.decryptEventIfNeeded(ev);
+
         if (ev.isBeingDecrypted()) {
             this.decryptingEvents.add(ev.getId());
         } else {
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index c0f3c59457..dbfba13297 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -811,7 +811,7 @@ export default class RoomView extends React.Component<IProps, IState> {
     };
 
     private onEvent = (ev) => {
-        if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
+        if (ev.isBeingDecrypted() || ev.isDecryptionFailure() || ev.shouldAttemptDecryption()) return;
         this.handleEffects(ev);
     };
 
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 5012d91a5f..af20c31cb2 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -1149,9 +1149,8 @@ class TimelinePanel extends React.Component {
         arrayFastClone(events)
             .reverse()
             .forEach(event => {
-                if (event.shouldAttemptDecryption()) {
-                    event.attemptDecryption(MatrixClientPeg.get()._crypto);
-                }
+                const client = MatrixClientPeg.get();
+                client.decryptEventIfNeeded(event);
             });
 
         const firstVisibleEventIndex = this._checkForPreJoinUISI(events);
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index b2f7f8a692..37737519ce 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -31,6 +31,7 @@ import {RovingAccessibleTooltipButton, useRovingTabIndex} from "../../../accessi
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 import {canCancel} from "../context_menus/MessageContextMenu";
 import Resend from "../../../Resend";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 
 const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFocusChange}) => {
     const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
@@ -122,6 +123,10 @@ export default class MessageActionBar extends React.PureComponent {
         if (this.props.mxEvent.status && this.props.mxEvent.status !== EventStatus.SENT) {
             this.props.mxEvent.on("Event.status", this.onSent);
         }
+
+        const client = MatrixClientPeg.get();
+        client.decryptEventIfNeeded(this.props.mxEvent);
+
         if (this.props.mxEvent.isBeingDecrypted()) {
             this.props.mxEvent.once("Event.decrypted", this.onDecrypted);
         }
diff --git a/src/components/views/messages/ViewSourceEvent.js b/src/components/views/messages/ViewSourceEvent.js
index adc7a248cd..2ec567c5ad 100644
--- a/src/components/views/messages/ViewSourceEvent.js
+++ b/src/components/views/messages/ViewSourceEvent.js
@@ -18,6 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 
 @replaceableComponent("views.messages.ViewSourceEvent")
 export default class ViewSourceEvent extends React.PureComponent {
@@ -36,6 +37,10 @@ export default class ViewSourceEvent extends React.PureComponent {
 
     componentDidMount() {
         const {mxEvent} = this.props;
+
+        const client = MatrixClientPeg.get();
+        client.decryptEventIfNeeded(mxEvent);
+
         if (mxEvent.isBeingDecrypted()) {
             mxEvent.once("Event.decrypted", () => this.forceUpdate());
         }
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 857dc5b248..ed4418140b 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -177,8 +177,10 @@ export default class EventIndex extends EventEmitter {
      * listener.
      */
     onRoomTimeline = async (ev, room, toStartOfTimeline, removed, data) => {
+        const client = MatrixClientPeg.get();
+
         // We only index encrypted rooms locally.
-        if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) return;
+        if (!client.isRoomEncrypted(room.roomId)) return;
 
         // If it isn't a live event or if it's redacted there's nothing to
         // do.
@@ -187,10 +189,7 @@ export default class EventIndex extends EventEmitter {
             return;
         }
 
-        if (ev.isBeingDecrypted()) {
-            // XXX: Private member access
-            await ev._decryptionPromise;
-        }
+        await client.decryptEventIfNeeded(ev);
 
         await this.addLiveEventToIndex(ev);
     }
@@ -518,19 +517,10 @@ export default class EventIndex extends EventEmitter {
             const decryptionPromises = matrixEvents
                 .filter(event => event.isEncrypted())
                 .map(event => {
-                    if (event.shouldAttemptDecryption()) {
-                        return event.attemptDecryption(client._crypto, {
-                            isRetry: true,
-                            emit: false,
-                        });
-                    } else {
-                        // TODO the decryption promise is a private property, this
-                        // should either be made public or we should convert the
-                        // event that gets fired when decryption is done into a
-                        // promise using the once event emitter method:
-                        // https://nodejs.org/api/events.html#events_events_once_emitter_name
-                        return event._decryptionPromise;
-                    }
+                    return client.decryptEventIfNeeded(event, {
+                        isRetry: true,
+                        emit: false,
+                    });
                 });
 
             // Let us wait for all the events to get decrypted.
diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts
index 84cf35aeb4..397d637125 100644
--- a/src/stores/widgets/StopGapWidget.ts
+++ b/src/stores/widgets/StopGapWidget.ts
@@ -400,6 +400,7 @@ export class StopGapWidget extends EventEmitter {
     }
 
     private onEvent = (ev: MatrixEvent) => {
+        MatrixClientPeg.get().decryptEventIfNeeded(ev);
         if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
         if (ev.getRoomId() !== this.eventListenerRoomId) return;
         this.feedEvent(ev);
diff --git a/test/test-utils.js b/test/test-utils.js
index 6dc02463a5..953693a820 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -95,6 +95,7 @@ export function createTestClient() {
                 getItem: jest.fn(),
             },
         },
+        decryptEventIfNeeded: () => Promise.resolve(),
     };
 }