diff --git a/spec/unit/matrixrtc/CallMembership.spec.ts b/spec/unit/matrixrtc/CallMembership.spec.ts
index eb4b1232a..4bc5492e0 100644
--- a/spec/unit/matrixrtc/CallMembership.spec.ts
+++ b/spec/unit/matrixrtc/CallMembership.spec.ts
@@ -85,9 +85,7 @@ describe("CallMembership", () => {
 
     it("considers memberships expired when local age large", () => {
         const fakeEvent = makeMockEvent(1000);
-        const evAge = 6000;
-        fakeEvent.getLocalAge = jest.fn().mockReturnValue(evAge);
-        fakeEvent.localTimestamp = Date.now() - evAge;
+        fakeEvent.getLocalAge = jest.fn().mockReturnValue(6000);
         const membership = new CallMembership(fakeEvent, membershipTemplate);
         expect(membership.isExpired()).toEqual(true);
     });
diff --git a/spec/unit/matrixrtc/mocks.ts b/spec/unit/matrixrtc/mocks.ts
index c373cdf9d..f710c49ab 100644
--- a/spec/unit/matrixrtc/mocks.ts
+++ b/spec/unit/matrixrtc/mocks.ts
@@ -61,7 +61,7 @@ export function mockRTCEvent(
         getSender: jest.fn().mockReturnValue("@mock:user.example"),
         getTs: jest.fn().mockReturnValue(1000),
         getLocalAge: getLocalAgeFn,
-        localTimestamp: Date.now() - getLocalAgeFn(),
+        localTimestamp: Date.now(),
         getRoomId: jest.fn().mockReturnValue(roomId),
         sender: {
             userId: "@mock:user.example",
diff --git a/src/matrixrtc/CallMembership.ts b/src/matrixrtc/CallMembership.ts
index d24b32add..d304c9df4 100644
--- a/src/matrixrtc/CallMembership.ts
+++ b/src/matrixrtc/CallMembership.ts
@@ -91,7 +91,7 @@ export class CallMembership {
     }
 
     public isExpired(): boolean {
-        return this.getMsUntilExpiry() <= 0;
+        return this.getAbsoluteExpiry() < this.parentEvent.getTs() + this.parentEvent.getLocalAge();
     }
 
     public getActiveFoci(): Focus[] {
diff --git a/src/models/event.ts b/src/models/event.ts
index 8768c0cd9..d2044eec9 100644
--- a/src/models/event.ts
+++ b/src/models/event.ts
@@ -392,7 +392,7 @@ export class MatrixEvent extends TypedEventEmitter<MatrixEventEmittedEvents, Mat
         });
 
         this.txnId = event.txn_id;
-        this.localTimestamp = Date.now() - (this.getAge() ?? this.fallbackAge());
+        this.localTimestamp = Date.now() - (this.getAge() ?? 0);
         this.reEmitter = new TypedReEmitter(this);
     }
 
@@ -663,21 +663,6 @@ export class MatrixEvent extends TypedEventEmitter<MatrixEventEmittedEvents, Mat
         return this.getUnsigned().age || this.event.age; // v2 / v1
     }
 
-    /**
-     * The fallbackAge is computed by using the origin_server_ts. So it is not adjusted
-     * to the local device clock. It should never be used.
-     * If there is no unsigned field in the event this is a better fallback then 0.
-     * It is supposed to only be used like this: `ev.getAge() ?? ev.fallbackAge()`
-     */
-    private fallbackAge(): number {
-        if (!this.getAge()) {
-            logger.warn(
-                "Age for event was not available, using `now - origin_server_ts` as a fallback. If the device clock is not correct issues might occur.",
-            );
-        }
-        return Math.max(Date.now() - this.getTs(), 0);
-    }
-
     /**
      * Get the age of the event when this function was called.
      * This is the 'age' field adjusted according to how long this client has
@@ -1399,7 +1384,7 @@ export class MatrixEvent extends TypedEventEmitter<MatrixEventEmittedEvents, Mat
             this.emit(MatrixEventEvent.LocalEventIdReplaced, this);
         }
 
-        this.localTimestamp = Date.now() - (this.getAge() ?? this.fallbackAge());
+        this.localTimestamp = Date.now() - this.getAge()!;
     }
 
     /**