diff --git a/apps/webapp/src/App.tsx b/apps/webapp/src/App.tsx
index 9033ff9b8..71e62d635 100644
--- a/apps/webapp/src/App.tsx
+++ b/apps/webapp/src/App.tsx
@@ -7,7 +7,6 @@ import TaskPage from './components/events/EventsTable';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { Toaster } from 'react-hot-toast';
 import { RootLayout } from './components/root-layout';
-import QuickStartPage from './components/quickstart';
 import ConfigurationPage from './components/configuration';
 import ApiKeysPage from './components/api-keys';
 import DashboardPage from './components/dashboard';
@@ -38,7 +37,7 @@ function App() {
         <Router>
           <Routes>
             <Route path='/' element={<RootLayout />}>
-              <Route index element={<QuickStartPage />} />
+              <Route index element={<ConnectionsPage />} />
               <Route path='/dashboard' element={<DashboardPage />} />
               <Route path='/logs' element={<LogsPage />} />
               <Route path='/tasks' element={<TaskPage />} />
diff --git a/apps/webapp/src/components/api-keys/index.tsx b/apps/webapp/src/components/api-keys/index.tsx
index 866c4a3dc..187437c8d 100644
--- a/apps/webapp/src/components/api-keys/index.tsx
+++ b/apps/webapp/src/components/api-keys/index.tsx
@@ -30,9 +30,6 @@ export default function ApiKeysPage() {
   const {idProject} = useProjectStore();
   const {profile} = useProfileStore();
   
-  if(isLoading){ 
-    return <LoadingSpinner className=""/>
-  }
 
   if(error){
     console.log("error apiKeys..");
@@ -61,6 +58,7 @@ export default function ApiKeysPage() {
           <h2 className="text-lg font-bold tracking-tight">Manage your api keys.</h2>
         </div>          
         <div className="flex space-y-8 md:flex pb-4">
+          {isLoading ? ( <LoadingSpinner className=""/>) : <>
           <div></div>
           <Dialog>
             <DialogTrigger asChild>
@@ -99,6 +97,8 @@ export default function ApiKeysPage() {
               </DialogFooter>
             </DialogContent>
           </Dialog>
+          </>
+          }
         </div>
         {tsApiKeys && <DataTable data={tsApiKeys} columns={columns} />}
       </div>