diff --git a/src/contexts/MessagesContext.tsx b/src/contexts/MessagesContext.tsx
index 3540374..71c9c05 100644
--- a/src/contexts/MessagesContext.tsx
+++ b/src/contexts/MessagesContext.tsx
@@ -251,9 +251,11 @@ export const MessagesProvider = (props: { children: ContextChildren }) => {
         resolve(m)
       }).catch((reason) => {
         console.warn('Failed to decrypt, will retry: ', message, reason);
-        setTimeout(() => {
-          resolve(actualDecrypt(sender, message));
-        }, 10 + Math.random() * 300);
+        resolve('');
+
+        // setTimeout(() => {
+        //   resolve(actualDecrypt(sender, message));
+        // }, 10 + Math.random() * 300);
       });
     });
   }
@@ -274,6 +276,10 @@ export const MessagesProvider = (props: { children: ContextChildren }) => {
         try {
           const content = await actualDecrypt(store.selectedSender, eMsg.content);
 
+          if (content === '') {
+            throw(eMsg.content);
+          }
+
           const msg: DirectMessage = {
             sender: eMsg.pubkey,
             content: sanitize(content),
@@ -284,7 +290,7 @@ export const MessagesProvider = (props: { children: ContextChildren }) => {
           newMessages.push(msg);
         } catch (e) {
           console.warn('Falied to decrypt message: ', e);
-          return;
+          continue;
         }
       }
     }
diff --git a/src/pages/Messages.tsx b/src/pages/Messages.tsx
index 8589a4e..26d60ba 100644
--- a/src/pages/Messages.tsx
+++ b/src/pages/Messages.tsx
@@ -208,8 +208,8 @@ const Messages: Component = () => {
       return;
     }
 
-    const senderIds = Object.keys(messages.senders);
-    senderIds.length > 0 && navigate(`/messages/${messages.senders[senderIds[0]].npub}`);
+    const senders = messages.orderedSenders();
+    senders.length > 0 && navigate(`/messages/${senders[0].npub}`);
   });
 
   createEffect(() => {
@@ -587,7 +587,7 @@ const Messages: Component = () => {
   onCleanup(() => {
     newMessageWrapper?.removeEventListener('input', () => onExpandableTextareaInput());
     newMessageInput && newMessageInput.removeEventListener('keydown', onKeyDown);
-    messages?.actions.selectSender();
+    // messages?.actions.selectSender();
   });
 
   const sendMessage = async () => {