diff --git a/android/app/src/main/assets/public/main.js b/android/app/src/main/assets/public/main.js
index 3cd1e385..91fa2d52 100644
--- a/android/app/src/main/assets/public/main.js
+++ b/android/app/src/main/assets/public/main.js
@@ -3030,9 +3030,9 @@ async function generateMessagesHtml(entries, isPinnedContext = false) {
         let content = msg.content;
         let reactions = msg.reactions || "";
         let decrypted = false;
+        let keyToUse = currentDmKey;
         if (msg.key && msg.key !== "") {
             try {
-                let keyToUse = currentDmKey;
                 if (window.currentRoomType === 'groups') {
                     keyToUse = await getGroupKey(currentDmId, msg.key);
                     if (keyToUse) {
diff --git a/webroot/main.js b/webroot/main.js
index 3cd1e385..91fa2d52 100644
--- a/webroot/main.js
+++ b/webroot/main.js
@@ -3030,9 +3030,9 @@ async function generateMessagesHtml(entries, isPinnedContext = false) {
         let content = msg.content;
         let reactions = msg.reactions || "";
         let decrypted = false;
+        let keyToUse = currentDmKey;
         if (msg.key && msg.key !== "") {
             try {
-                let keyToUse = currentDmKey;
                 if (window.currentRoomType === 'groups') {
                     keyToUse = await getGroupKey(currentDmId, msg.key);
                     if (keyToUse) {