diff --git a/spec/unit/crypto.spec.js b/spec/unit/crypto.spec.js
index 734941cb5..1b28ad683 100644
--- a/spec/unit/crypto.spec.js
+++ b/spec/unit/crypto.spec.js
@@ -6,6 +6,7 @@ import expect from 'expect';
 
 const sdk = require("../..");
 
+const Olm = global.Olm;
 
 describe("Crypto", function() {
     if (!sdk.CRYPTO_ENABLED) {
diff --git a/spec/unit/crypto/algorithms/megolm.spec.js b/spec/unit/crypto/algorithms/megolm.spec.js
index db28e3a51..6c777859e 100644
--- a/spec/unit/crypto/algorithms/megolm.spec.js
+++ b/spec/unit/crypto/algorithms/megolm.spec.js
@@ -21,6 +21,8 @@ const MegolmDecryption = algorithms.DECRYPTION_CLASSES['m.megolm.v1.aes-sha2'];
 
 const ROOM_ID = '!ROOM:ID';
 
+const Olm = global.Olm;
+
 describe("MegolmDecryption", function() {
     if (!global.Olm) {
         console.warn('Not running megolm unit tests: libolm not present');
diff --git a/src/client.js b/src/client.js
index 8ca115a38..1a05998eb 100644
--- a/src/client.js
+++ b/src/client.js
@@ -60,7 +60,7 @@ const LAZY_LOADING_SYNC_FILTER = {
 
 
 const SCROLLBACK_DELAY_MS = 3000;
-let CRYPTO_ENABLED = isCryptoAvailable();
+const CRYPTO_ENABLED = isCryptoAvailable();
 
 /**
  * Construct a Matrix Client. Only directly construct this if you want to use
@@ -383,7 +383,6 @@ MatrixClient.prototype.initCrypto = async function() {
             `End-to-end encryption not supported in this js-sdk build: did ` +
                 `you remember to load the olm library?`,
         );
-        return;
     }
 
     if (this._crypto) {