1 files changed, 9 insertions, 2 deletions
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 615a15b3..a76756ae 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -1028,8 +1028,15 @@ ChatPage::decryptDownloadedSecrets(mtx::secret_storage::AesHmacSha2KeyDescriptio
 
         auto decryptionKey = mtx::crypto::key_from_recoverykey(text.toStdString(), keyDesc);
 
-        if (!decryptionKey)
-                decryptionKey = mtx::crypto::key_from_passphrase(text.toStdString(), keyDesc);
+        if (!decryptionKey && keyDesc.passphrase) {
+                try {
+                        decryptionKey =
+                          mtx::crypto::key_from_passphrase(text.toStdString(), keyDesc);
+                } catch (std::exception &e) {
+                        nhlog::crypto()->error("Failed to derive secret key from passphrase: {}",
+                                               e.what());
+                }
+        }
 
         if (!decryptionKey) {
                 QMessageBox::information(