diff --git a/lib/client.js b/lib/client.js
index 682262368..925fdc4d3 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -22,7 +22,9 @@ var CRYPTO_ENABLED = false;
 
 try {
     var Olm = require("olm");
-    CRYPTO_ENABLED = true;
+    if (Olm.Account && Olm.Session) {
+        CRYPTO_ENABLED = true;
+    }
 } catch (e) {
     // Olm not installed.
 }