diff --git a/frontend/pshared/lib/provider/organizations.dart b/frontend/pshared/lib/provider/organizations.dart
index 2a06728..0ea744e 100644
--- a/frontend/pshared/lib/provider/organizations.dart
+++ b/frontend/pshared/lib/provider/organizations.dart
@@ -35,6 +35,8 @@ class OrganizationsProvider extends ChangeNotifier {
     _setResource(_resource.copyWith(isLoading: true, error: null));
     try {
       final orgs = await OrganizationService.list();
+      // keep fetched organizations so _org can resolve against them
+      _setResource(Resource(data: orgs, isLoading: true));
       // fetch stored org
       String? org = await SecureStorageService.get(Constants.currentOrgKey);
       // check stored org availability
@@ -54,6 +56,7 @@ class OrganizationsProvider extends ChangeNotifier {
     _setResource(_resource.copyWith(isLoading: true, error: null));
     try {
       final org = await OrganizationService.loadByInvitation(invitationRef);
+      _setResource(Resource(data: [org], isLoading: true));
       await setCurrentOrganization(org.id);
       _setResource(Resource(data: [org], isLoading: false));
       return org;