diff --git a/src/crypto/algorithms/megolm.js b/src/crypto/algorithms/megolm.js
index cf0b848b9..762a86459 100644
--- a/src/crypto/algorithms/megolm.js
+++ b/src/crypto/algorithms/megolm.js
@@ -473,8 +473,7 @@ MegolmEncryption.prototype._getDevicesInRoom = function(room) {
     // common and then added new devices before joining this one? --Matthew
     //
     // yup, see https://github.com/vector-im/riot-web/issues/2305 --richvdh
-    var self = this;
-    return self._crypto.downloadKeys(roomMembers, false).then(function(devices) {
+    return this._crypto.downloadKeys(roomMembers, false).then((devices) => {
         // remove any blocked devices
         for (const userId in devices) {
             if (!devices.hasOwnProperty(userId)) {
@@ -490,8 +489,8 @@ MegolmEncryption.prototype._getDevicesInRoom = function(room) {
                 if (userDevices[deviceId].isBlocked() ||
                     (userDevices[deviceId].isUnverified() &&
                      (room.getBlacklistUnverifiedDevices() ||
-                      self._crypto.getGlobalBlacklistUnverifiedDevices())))
-                {
+                      this._crypto.getGlobalBlacklistUnverifiedDevices()))
+                   ) {
                     delete userDevices[deviceId];
                 }
             }