diff --git a/packages/desktop/src/providers/RouterProvider.tsx b/packages/desktop/src/providers/RouterProvider.tsx
index b203925..d52f347 100644
--- a/packages/desktop/src/providers/RouterProvider.tsx
+++ b/packages/desktop/src/providers/RouterProvider.tsx
@@ -23,14 +23,6 @@ const RouterContext = React.createContext<IRouterContext>({
 export function RouterProvider({ children }: { children: React.ReactNode }) {
   const [page, setPage] = useState<TPage>('WELCOME');
 
-  const { selectedConversation } = useConversations();
-
-  useEffect(() => {
-    if (selectedConversation) {
-      setPage('SELECTED_CONVERSATION');
-    }
-  }, [setPage, selectedConversation]);
-
   const handleSetPage = useCallback((newPage: TPage) => () => setPage(newPage), [setPage]);
 
   return (
diff --git a/packages/desktop/src/tree/NewConversationDialog.tsx b/packages/desktop/src/tree/NewConversationDialog.tsx
index 80becad..d414254 100644
--- a/packages/desktop/src/tree/NewConversationDialog.tsx
+++ b/packages/desktop/src/tree/NewConversationDialog.tsx
@@ -17,10 +17,8 @@ import {
   styled,
 } from '@mui/material';
 import React, { HTMLAttributes, useCallback, useEffect, useState } from 'react';
-import { useDebounce, useKeyPressEvent, useToggle } from 'react-use';
 
 import CircularProgress from '@mui/material/CircularProgress';
-import CreateConversationRequest from '../../../core/requests/CreateConversationRequest.request';
 import { FiX } from 'react-icons/fi';
 import { NirvanaRules } from '../util/rules';
 import User from '@nirvana/core/models/user.model';
@@ -103,6 +101,7 @@ export default function NewConversationDialog() {
     if (succeeded) {
       setSelectedUsers([]);
       setConversationName('');
+      handleSetPage('SELECTED_CONVERSATION');
     }
 
     setIsSubmitting(false);
@@ -113,6 +112,7 @@ export default function NewConversationDialog() {
     setSelectedUsers,
     setIsSubmitting,
     handleStartConversation,
+    handleSetPage,
   ]);
 
   return (