diff --git a/packages/frontend/src/Index.tsx b/packages/frontend/src/Index.tsx
index ace5dfd..57b5ee4 100644
--- a/packages/frontend/src/Index.tsx
+++ b/packages/frontend/src/Index.tsx
@@ -32,6 +32,7 @@ function Index() {
             .then((res) => res.json())
             .then((data: Array<OrganisationResponse>) => {
                 setOrganisations(data);
+                setSelectedOrganisation(data[0] || null);
             })
             .catch((err) => {
                 console.error("error fetching organisations:", err);
@@ -78,6 +79,12 @@ function Index() {
             });
     }, [selectedProject]);
 
+    useEffect(() => {
+        if (projects.length > 0) {
+            setSelectedProject(projects[0]);
+        }
+    }, [projects]);
+
     return (
         <main className="w-full h-full p-1">
             {/* header area */}