diff --git a/src/matrix/room/Room.js b/src/matrix/room/Room.js
index 967cb8b2..5e3ef643 100644
--- a/src/matrix/room/Room.js
+++ b/src/matrix/room/Room.js
@@ -163,7 +163,7 @@ export class Room extends EventEmitter {
             if (this._observedEvents) {
                 this._observedEvents.updateEvents(entries);
             }
-        }, this._platform.logger, log);
+        }, ensureLogItem(log));
         return request;
     }
 
@@ -746,10 +746,10 @@ export class Room extends EventEmitter {
 }
 
 class DecryptionRequest {
-    constructor(decryptFn, logger, log) {
+    constructor(decryptFn, log) {
         this._cancelled = false;
         this.preparation = null;
-        this._promise = logger.wrapOrRun(log, "decryptEntries", log => decryptFn(this, log));
+        this._promise = log.wrap("decryptEntries", log => decryptFn(this, log));
     }
 
     complete() {