diff --git a/apps/metadata-editor/src/app/dashboard/sidebar/sidebar.component.html b/apps/metadata-editor/src/app/dashboard/sidebar/sidebar.component.html
index a6529d42fe..69efa62300 100644
--- a/apps/metadata-editor/src/app/dashboard/sidebar/sidebar.component.html
+++ b/apps/metadata-editor/src/app/dashboard/sidebar/sidebar.component.html
@@ -41,7 +41,7 @@
 
   <div class="flex flex-col pt-9 px-5 gap-10 bg-neutral-100 h-full grow">
     <ng-container *ngIf="organisations$ | async as organisations">
-      <ng-container *ngIf="organisations[0].name">
+      <ng-container *ngIf="organisations[0]?.name">
         <gn-ui-button
           *ngIf="organisations[0].logoUrl?.href"
           type="default"
diff --git a/apps/metadata-editor/src/app/dashboard/sidebar/sidebar.component.ts b/apps/metadata-editor/src/app/dashboard/sidebar/sidebar.component.ts
index c2bbfe3026..0aeb4afca0 100644
--- a/apps/metadata-editor/src/app/dashboard/sidebar/sidebar.component.ts
+++ b/apps/metadata-editor/src/app/dashboard/sidebar/sidebar.component.ts
@@ -38,7 +38,7 @@ export class SidebarComponent implements OnInit {
     this.organisations$ = combineLatest(
       this.organisationsService.organisations$,
       this.platformService.getMe(),
-      (orgs, me) => orgs.filter((org) => org.name === me.organisation)
+      (orgs, me) => orgs.filter((org) => org.name === me?.organisation)
     )
   }
 }