diff --git a/src/components/structures/TimelinePanel.tsx b/src/components/structures/TimelinePanel.tsx
index c5e9c77f40..f742adad89 100644
--- a/src/components/structures/TimelinePanel.tsx
+++ b/src/components/structures/TimelinePanel.tsx
@@ -1115,11 +1115,12 @@ class TimelinePanel extends React.Component<IProps, IState> {
     public forgetReadMarker = (): void => {
         if (!this.props.manageReadMarkers) return;
 
+        // Find the read receipt - we will set the read marker to this
         const rmId = this.getCurrentReadReceipt();
 
-        // see if we know the timestamp for the rr event
+        // Look up the timestamp if we can find it
         const tl = this.props.timelineSet.getTimelineForEvent(rmId);
-        let rmTs;
+        let rmTs: number;
         if (tl) {
             const event = tl.getEvents().find((e) => { return e.getId() == rmId; });
             if (event) {
@@ -1127,7 +1128,11 @@ class TimelinePanel extends React.Component<IProps, IState> {
             }
         }
 
+        // Update the read marker to the values we found
         this.setReadMarker(rmId, rmTs);
+
+        // Send the receipts to the server immediately (don't wait for activity)
+        this.sendReadReceipt();
     };
 
     /* return true if the content is fully scrolled down and we are
diff --git a/test/components/structures/TimelinePanel-test.tsx b/test/components/structures/TimelinePanel-test.tsx
new file mode 100644
index 0000000000..ab3e2de25f
--- /dev/null
+++ b/test/components/structures/TimelinePanel-test.tsx
@@ -0,0 +1,98 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount, ReactWrapper } from "enzyme";
+import { MessageEvent } from 'matrix-events-sdk';
+import { EventTimelineSet, MatrixEvent, PendingEventOrdering, Room } from 'matrix-js-sdk/src/matrix';
+
+import { stubClient } from "../../test-utils";
+import TimelinePanel from '../../../src/components/structures/TimelinePanel';
+import { MatrixClientPeg } from '../../../src/MatrixClientPeg';
+
+function newReceipt(eventId: string, userId: string, readTs: number, fullyReadTs: number): MatrixEvent {
+    const receiptContent = {
+        [eventId]: {
+            "m.read": { [userId]: { ts: readTs } },
+            "org.matrix.msc2285.read.private": { [userId]: { ts: readTs } },
+            "m.fully_read": { [userId]: { ts: fullyReadTs } },
+        },
+    };
+    return new MatrixEvent({ content: receiptContent, type: "m.receipt" });
+}
+
+describe('TimelinePanel', () => {
+    describe('Read Receipts and Markers', () => {
+        it('Forgets the read marker when asked to', () => {
+            stubClient();
+            const cli = MatrixClientPeg.get();
+            const readMarkersSent = [];
+
+            // Track calls to setRoomReadMarkers
+            cli.setRoomReadMarkers = (_roomId, rmEventId, _a, _b) => {
+                readMarkersSent.push(rmEventId);
+                return Promise.resolve({});
+            };
+
+            const ev0 = new MatrixEvent({
+                event_id: "ev0",
+                sender: "@u2:m.org",
+                origin_server_ts: 111,
+                ...MessageEvent.from("hello 1").serialize(),
+            });
+            const ev1 = new MatrixEvent({
+                event_id: "ev1",
+                sender: "@u2:m.org",
+                origin_server_ts: 222,
+                ...MessageEvent.from("hello 2").serialize(),
+            });
+
+            const roomId = "#room:example.com";
+            const userId = cli.credentials.userId;
+            const room = new Room(
+                roomId,
+                cli,
+                userId,
+                { pendingEventOrdering: PendingEventOrdering.Detached },
+            );
+
+            // Create a TimelinePanel with ev0 already present
+            const timelineSet = new EventTimelineSet(room, {});
+            timelineSet.addLiveEvent(ev0);
+            const component: ReactWrapper<TimelinePanel> = mount(<TimelinePanel
+                timelineSet={timelineSet}
+                manageReadMarkers={true}
+                manageReadReceipts={true}
+                eventId={ev0.getId()}
+            />);
+            const timelinePanel = component.instance() as TimelinePanel;
+
+            // An event arrived, and we read it
+            timelineSet.addLiveEvent(ev1);
+            room.addEphemeralEvents([newReceipt("ev1", userId, 222, 220)]);
+
+            // Sanity: We have not sent any read marker yet
+            expect(readMarkersSent).toEqual([]);
+
+            // This is what we are testing: forget the read marker - this should
+            // update our read marker to match the latest receipt we sent
+            timelinePanel.forgetReadMarker();
+
+            // We sent off a read marker for the new event
+            expect(readMarkersSent).toEqual(["ev1"]);
+        });
+    });
+});