diff --git a/client/src/components/Conversations/Conversation.jsx b/client/src/components/Conversations/Conversation.jsx
index 543e9c9161..65dcdad2a2 100644
--- a/client/src/components/Conversations/Conversation.jsx
+++ b/client/src/components/Conversations/Conversation.jsx
@@ -4,7 +4,6 @@ import { useUpdateConversationMutation } from '~/data-provider';
 import RenameButton from './RenameButton';
 import DeleteButton from './DeleteButton';
 import ConvoIcon from '../svg/ConvoIcon';
-import manualSWR from '~/utils/fetchers';
 
 import store from '~/store';
 
diff --git a/client/src/components/Nav/index.jsx b/client/src/components/Nav/index.jsx
index 4bb12082a5..6e1530cdbb 100644
--- a/client/src/components/Nav/index.jsx
+++ b/client/src/components/Nav/index.jsx
@@ -37,7 +37,7 @@ export default function Nav({ navVisible, setNavVisible }) {
   const conversation = useRecoilValue(store.conversation);
   const { conversationId } = conversation || {};
   const setSearchResultMessages = useSetRecoilState(store.searchResultMessages);
-
+  const refreshConversationsHint = useRecoilValue(store.refreshConversationsHint);
   const { refreshConversations } = store.useConversations();
 
   const [isFetching, setIsFetching] = useState(false);
@@ -112,6 +112,12 @@ export default function Nav({ navVisible, setNavVisible }) {
     }
   }, [getConversationsQuery.isSuccess, getConversationsQuery.data, isSearching, pageNumber]);
 
+  useEffect(() => {
+    if (!isSearching) {
+      getConversationsQuery.refetch();
+    }
+  }, [pageNumber, conversationId, refreshConversationsHint]);
+
   const moveToTop = () => {
     const container = containerRef.current;
     if (container) {
diff --git a/client/src/data-provider/data-service.ts b/client/src/data-provider/data-service.ts
index 621831a0ee..adb9cca9f6 100644
--- a/client/src/data-provider/data-service.ts
+++ b/client/src/data-provider/data-service.ts
@@ -2,10 +2,6 @@ import * as t from './types';
 import request from './request';
 import * as endpoints from './endpoints';
 
-export function getOpenAIModels(): Promise<t.TOpenAIModels> {
-  return request.get(endpoints.openAiModels());
-}
-
 export function postAICompletion(payload: t.TAICompletionRequest) {
   return request.post(endpoints.getAICompletion(), payload);
 }
@@ -19,10 +15,6 @@ export function deleteConversation(payload: t.TDeleteConversationRequest) {
   return request.post(endpoints.deleteConversation(), payload);
 }
 
-export function clearAllConversations() {
-  return request.post(endpoints.deleteConversation());
-}
-
 export function getMessagesByConvoId(id: string): Promise<t.TMessage[]> {
   return request.get(endpoints.getMessages(id));
 }
diff --git a/client/src/data-provider/react-query-service.ts b/client/src/data-provider/react-query-service.ts
index afb05d45f8..a0080b3b73 100644
--- a/client/src/data-provider/react-query-service.ts
+++ b/client/src/data-provider/react-query-service.ts
@@ -52,7 +52,6 @@ export const useGetConversationByIdQuery = (
       refetchOnWindowFocus: false,
       refetchOnReconnect: false,
       refetchOnMount: false,
-      enabled: false,
       ...config
     }
   );
@@ -148,7 +147,7 @@ export const useClearConversationsMutation = (): UseMutationResult<unknown> => {
 export const useGetConversationsQuery = (pageNumber: string): QueryObserverResult<t.TGetConversationsResponse> => {
   return useQuery([QueryKeys.allConversations, pageNumber], () =>
     dataService.getConversations(pageNumber), {
-      refetchOnWindowFocus: false,
+      // refetchOnWindowFocus: false,
       refetchOnReconnect: false,
       refetchOnMount: false,
     }
diff --git a/client/src/data-provider/types.ts b/client/src/data-provider/types.ts
index d430833bd0..82324be8fd 100644
--- a/client/src/data-provider/types.ts
+++ b/client/src/data-provider/types.ts
@@ -186,10 +186,6 @@ export type TDeleteCustomGptRequest = {
 
 export type TDeleteCustomGptResponse = {};
 
-export type TClearConversationsRequest = {};
-
-export type TClearConversationsResponse = {};
-
 export type TGetCustomGptsResponse = {};
 
 export type TSearchResults = {};
\ No newline at end of file