diff --git a/Server/Forms/FrmSettings.cs b/Server/Forms/FrmSettings.cs
index c4a9cfd7..b9c39589 100644
--- a/Server/Forms/FrmSettings.cs
+++ b/Server/Forms/FrmSettings.cs
@@ -61,6 +61,10 @@ private void btnListen_Click(object sender, EventArgs e)
                 return;
             }
 
+            var newPassword = txtPassword.Text;
+            if (newPassword != Settings.Password)
+                AES.PreHashKey(newPassword);
+
             if (btnListen.Text == "Start listening" && !_listenServer.Listening)
             {
                 try