diff --git a/src/js/main.js b/src/js/main.js
index ef0b60e..c143823 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -449,7 +449,8 @@ $(function() {
   function saveKey() {
     $('.edit-key').hide();
     $('.read-key').show();
-    updateKeyVal($('.edit-key input.key').val());    
+    var key = $('.edit-key input.key').val().trim();
+    updateKeyVal(key || encryptionKey);    
   }
 
   $('#join-modal .modal-footer button').click(function() {