diff --git a/src/matrix-server-config.html b/src/matrix-server-config.html
index 83bff78..5aefda6 100644
--- a/src/matrix-server-config.html
+++ b/src/matrix-server-config.html
@@ -29,7 +29,7 @@
             userId: { type: "text", required: true },
             deviceLabel: { type: "text", required: false },
             accessToken: { type: "password", required: true },
-            deviceId: { type: "text", required: true },
+            deviceId: { type: "text", required: false },
             url: { type: "text", required: true }
         },
         defaults: {
@@ -91,8 +91,8 @@
         <input type="text" id="node-config-input-deviceId">
     </div>
     <div class="form-tips" style="margin-bottom: 12px;">
-        If you have a Device ID for this auth token you can place it here, or you can leave it blank to have one automatically generated (this field will always be blank if auto generated as it is saved internally).<br />
-        WARNING: If you change this after the client has already initialized you will break encryption.
+        If you have a Device ID for this auth token you can place it here, or you can leave it blank to have one automatically generated (this field will always be blank if auto generated as it is saved internally). DO NOT manually set one, this must be generated by the server.<br />
+        WARNING: If you change this after the client has already initialized you will break encryption. Your Device ID is tied to your encryption keys.
     </div>
 
     <div class="form-row">
diff --git a/src/matrix-server-config.js b/src/matrix-server-config.js
index bd8fd3c..da99ffd 100644
--- a/src/matrix-server-config.js
+++ b/src/matrix-server-config.js
@@ -346,7 +346,7 @@ module.exports = function(RED) {
             deviceLabel: { type: "text", required: false },
             userId: { type: "text", required: true },
             accessToken: { type: "text", required: true },
-            deviceId: { type: "text", required: true },
+            deviceId: { type: "text", required: false },
             url: { type: "text", required: true }
         }
     });