diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index a320a02da8..60f9898e35 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -258,6 +258,10 @@ module.exports = React.createClass({
     },
 
     _renderDeviceInfo: function() {
+        if (!UserSettingsStore.isFeatureEnabled("e2e_encryption")) {
+            return null;
+        }
+
         var client = MatrixClientPeg.get();
         var deviceId = client.deviceId;
         var olmKey = client.getDeviceEd25519Key() || "<not supported>";
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 1eee280eb5..97cfecc9e1 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -30,6 +30,7 @@ var MatrixClientPeg = require("../../../MatrixClientPeg");
 var dis = require("../../../dispatcher");
 var Modal = require("../../../Modal");
 var sdk = require('../../../index');
+var UserSettingsStore = require('../../../UserSettingsStore');
 var createRoom = require('../../../createRoom');
 
 module.exports = React.createClass({
@@ -506,6 +507,10 @@ module.exports = React.createClass({
     },
 
     _renderDevices: function() {
+        if (!UserSettingsStore.isFeatureEnabled("e2e_encryption")) {
+            return null;
+        }
+
         var devices = this.state.devices;
         var MemberDeviceInfo = sdk.getComponent('rooms.MemberDeviceInfo');
         var Spinner = sdk.getComponent("elements.Spinner");