diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 4b779377e8..15ca931fc8 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -69,6 +69,8 @@ export default class DeviceListener {
     async recheck() {
         const cli = MatrixClientPeg.get();
 
+        if (!cli.isCryptoEnabled()) return false;
+
         const devices = await cli.getStoredDevicesForUser(cli.getUserId());
         for (const device of devices) {
             if (device.deviceId == cli.deviceId) continue;