diff --git a/package.json b/package.json
index 04c46b0..9fb74ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-matrix-chat",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Matrix chat server client for Node-RED",
   "dependencies": {
     "got": "^11.8.2",
diff --git a/src/matrix-server-config.js b/src/matrix-server-config.js
index 61775f8..df07f5e 100644
--- a/src/matrix-server-config.js
+++ b/src/matrix-server-config.js
@@ -27,8 +27,8 @@ module.exports = function(RED) {
         this.deviceId = this.credentials.deviceId || null;
         this.url = this.credentials.url;
         this.autoAcceptRoomInvites = n.autoAcceptRoomInvites;
-        this.enableE2ee = this.enableE2ee || false;
-        this.e2ee = this.enableE2ee && this.deviceId;
+        this.enableE2ee = n.enableE2ee || false;
+        this.e2ee = (this.enableE2ee && this.deviceId);
 
         if(!this.credentials.accessToken) {
             node.log("Matrix connection failed: missing access token.");