diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 2b39ae3930..344d8a1ede 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -446,6 +446,8 @@ module.exports = React.createClass({
     },
 
     onEnableEncryptionClick() {
+        if (!this.refs.encrypt.checked) return;
+
         var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createDialog(QuestionDialog, {
             title: "Warning!",