diff --git a/src/components/Chat/ChatGroup.tsx b/src/components/Chat/ChatGroup.tsx
index 9d38ce8..f5039c0 100644
--- a/src/components/Chat/ChatGroup.tsx
+++ b/src/components/Chat/ChatGroup.tsx
@@ -182,7 +182,6 @@ const [messageSize, setMessageSize] = useState(0)
       try {
         if(!secretKeyRef.current){
           checkForFirstSecretKeyNotification(encryptedMessages)
-          return
         }
         return new Promise((res, rej)=> {
           window.sendMessage("decryptSingle", {
diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx
index df1f0c3..5cf00ef 100644
--- a/src/components/Group/Group.tsx
+++ b/src/components/Group/Group.tsx
@@ -2487,8 +2487,7 @@ export const Group = ({
                     handleNewEncryptionNotification={
                       setNewEncryptionNotification
                     }
-                    hide={groupSection !== "chat" || !secretKey || selectedDirect || newChat}
-                    hideView={!(desktopViewMode === 'chat' && selectedGroup)}
+                    hide={groupSection !== "chat" || selectedDirect || newChat}
                     handleSecretKeyCreationInProgress={
                       handleSecretKeyCreationInProgress
                     }
@@ -2542,6 +2541,10 @@ export const Group = ({
                           Wait until an admin re-encrypts the keys.
                         </Typography>
                         <Spacer height="25px" />
+                        <Typography>
+                          <strong>Only unencrypted messages will be displayed.</strong>
+                        </Typography>
+                        <Spacer height="25px" />
                         <Typography>
                           Try notifying an admin from the list of admins below:
                         </Typography>