diff --git a/src/crypto/index.js b/src/crypto/index.js
index 7b1dad314..c71f6bd63 100644
--- a/src/crypto/index.js
+++ b/src/crypto/index.js
@@ -1806,17 +1806,15 @@ Crypto.prototype.exportRoomKeys = async function() {
  * @return {module:client.Promise} a promise which resolves once the keys have been imported
  */
 Crypto.prototype.importRoomKeys = function(keys) {
-    return Promise.map(
-        keys, (key) => {
-            if (!key.room_id || !key.algorithm) {
-                logger.warn("ignoring room key entry with missing fields", key);
-                return null;
-            }
+    return Promise.all(keys.map((key) => {
+        if (!key.room_id || !key.algorithm) {
+            logger.warn("ignoring room key entry with missing fields", key);
+            return null;
+        }
 
-            const alg = this._getRoomDecryptor(key.room_id, key.algorithm);
-            return alg.importRoomKey(key);
-        },
-    );
+        const alg = this._getRoomDecryptor(key.room_id, key.algorithm);
+        return alg.importRoomKey(key);
+    }));
 };
 
 /**
@@ -2767,14 +2765,10 @@ Crypto.prototype._processReceivedRoomKeyRequests = async function() {
         // cancellation (and end up with a cancelled request), rather than the
         // cancellation before the request (and end up with an outstanding
         // request which should have been cancelled.)
-        await Promise.map(
-            requests, (req) =>
-                this._processReceivedRoomKeyRequest(req),
-        );
-        await Promise.map(
-            cancellations, (cancellation) =>
-                this._processReceivedRoomKeyRequestCancellation(cancellation),
-        );
+        await Promise.all(requests.map((req) =>
+            this._processReceivedRoomKeyRequest(req)));
+        await Promise.all(cancellations.map((cancellation) =>
+            this._processReceivedRoomKeyRequestCancellation(cancellation)));
     } catch (e) {
         logger.error(`Error processing room key requsts: ${e}`);
     } finally {