diff --git a/modules/UI/authentication/RoomLocker.js b/modules/UI/authentication/RoomLocker.js
index 2e9c55715..de08a4b53 100644
--- a/modules/UI/authentication/RoomLocker.js
+++ b/modules/UI/authentication/RoomLocker.js
@@ -185,6 +185,10 @@ export default function createRoomLocker (room) {
                 newPass => { password = newPass; }
             ).catch(
                 reason => {
+                    // user canceled, no pass was entered.
+                    // clear, as if we use the same instance several times
+                    // pass stays between attempts
+                    password = null;
                     if (reason !== APP.UI.messageHandler.CANCEL)
                         console.error(reason);
                 }