diff --git a/src/components/Chat/ChatGroup.tsx b/src/components/Chat/ChatGroup.tsx
index f5039c0..4ff4f94 100644
--- a/src/components/Chat/ChatGroup.tsx
+++ b/src/components/Chat/ChatGroup.tsx
@@ -746,9 +746,9 @@ const clearEditorContent = () => {
     left: hide && '-100000px',
     }}>
               
-              <ChatList openQManager={openQManager} enableMentions onReply={onReply} onEdit={onEdit} chatId={selectedGroup} initialMessages={messages} myAddress={myAddress} tempMessages={tempMessages} handleReaction={handleReaction} chatReferences={chatReferences} tempChatReferences={tempChatReferences} members={members} myName={myName} selectedGroup={selectedGroup} />
+              <ChatList hasSecretKey={!!secretKey} openQManager={openQManager} enableMentions onReply={onReply} onEdit={onEdit} chatId={selectedGroup} initialMessages={messages} myAddress={myAddress} tempMessages={tempMessages} handleReaction={handleReaction} chatReferences={chatReferences} tempChatReferences={tempChatReferences} members={members} myName={myName} selectedGroup={selectedGroup} />
              
-   
+              {!!secretKey && (
       <div style={{
         // position: 'fixed',
         // bottom: '0px',
@@ -818,7 +818,8 @@ const clearEditorContent = () => {
       )}
      
      
-      <Tiptap enableMentions setEditorRef={setEditorRef} onEnter={sendMessage} isChat disableEnter={isMobile ? true : false} isFocusedParent={isFocusedParent} setIsFocusedParent={setIsFocusedParent} membersWithNames={members} />
+       <Tiptap enableMentions setEditorRef={setEditorRef} onEnter={sendMessage} isChat disableEnter={isMobile ? true : false} isFocusedParent={isFocusedParent} setIsFocusedParent={setIsFocusedParent} membersWithNames={members} />
+    
       </div>
       {messageSize > 750 && (
         <Box sx={{
@@ -899,6 +900,7 @@ const clearEditorContent = () => {
               </Box>
       {/* <button onClick={sendMessage}>send</button> */}
       </div>
+              )}
       {isOpenQManager !== null && (
  <Box sx={{
   position: 'fixed',
diff --git a/src/components/Chat/ChatList.tsx b/src/components/Chat/ChatList.tsx
index f33b9d6..8c16c93 100644
--- a/src/components/Chat/ChatList.tsx
+++ b/src/components/Chat/ChatList.tsx
@@ -27,7 +27,8 @@ export const ChatList = ({
   myName,
   selectedGroup,
   enableMentions,
-  openQManager
+  openQManager,
+  hasSecretKey
 }) => {
   const parentRef = useRef();
   const [messages, setMessages] = useState(initialMessages);
@@ -406,7 +407,7 @@ export const ChatList = ({
           </button>
         )}
       </div>
-      {enableMentions && (
+      {enableMentions && hasSecretKey && (
         <ChatOptions
         openQManager={openQManager}
           messages={messages}