diff --git a/src/App.tsx b/src/App.tsx
index 5755dca..aab17d7 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -442,7 +442,7 @@ function App() {
   const { isShow, onCancel, onOk, show, message } = useModal();
   const {isUserBlocked,
     addToBlockList,
-    removeBlockFromList, getAllBlockedUsers} = useBlockedAddresses()
+    removeBlockFromList, getAllBlockedUsers} = useBlockedAddresses(extState === 'authenticated')
   const {
     isShow: isShowUnsavedChanges,
     onCancel: onCancelUnsavedChanges,
diff --git a/src/components/Chat/useBlockUsers.tsx b/src/components/Chat/useBlockUsers.tsx
index 42daeb4..b73ac85 100644
--- a/src/components/Chat/useBlockUsers.tsx
+++ b/src/components/Chat/useBlockUsers.tsx
@@ -3,7 +3,7 @@ import React, { useCallback,  useEffect,  useRef } from "react";
 
 
 
-export const useBlockedAddresses = () => {
+export const useBlockedAddresses = (isAuthenticated: boolean) => {
   const userBlockedRef = useRef({})
   const userNamesBlockedRef = useRef({})
 
@@ -28,6 +28,9 @@ export const useBlockedAddresses = () => {
   }, [])
 
   useEffect(()=> {
+       if (!isAuthenticated) return;
+    userBlockedRef.current = {};
+    userNamesBlockedRef.current = {};
     const fetchBlockedList = async ()=> {
       try {
       const response =  await new Promise((res, rej) => {
@@ -86,7 +89,7 @@ export const useBlockedAddresses = () => {
       }
     }
     fetchBlockedList()
-  }, [])
+  }, [isAuthenticated])
 
   const removeBlockFromList = useCallback(async (address, name)=> {
     if(name){