diff --git a/lib/main_app.dart b/lib/main_app.dart
index 561504fc3..c8801fd3e 100644
--- a/lib/main_app.dart
+++ b/lib/main_app.dart
@@ -143,10 +143,6 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
       final store = widget.store;
       final state = store.state;
 
-      if (!state.isSelfHosted) {
-        return;
-      }
-
       if (!state.authState.isAuthenticated) {
         return;
       }
diff --git a/lib/redux/app/app_middleware.dart b/lib/redux/app/app_middleware.dart
index 23874adf6..08ced4ae1 100644
--- a/lib/redux/app/app_middleware.dart
+++ b/lib/redux/app/app_middleware.dart
@@ -235,11 +235,19 @@ Middleware<AppState> _createLoadState(
       AppBuilder.of(action.context).rebuild();
       store.dispatch(LoadStateSuccess(appState));
 
-      store.dispatch(RefreshData(
-          completer: Completer<Null>()
-            ..future.catchError((Object error) {
-              store.dispatch(UserLogout());
-            })));
+      if (store.state.company.isLarge) {
+        store.dispatch(LoadClients(
+            completer: Completer<Null>()
+              ..future.catchError((Object error) {
+                store.dispatch(UserLogout());
+              })));
+      } else {
+        store.dispatch(RefreshData(
+            completer: Completer<Null>()
+              ..future.catchError((Object error) {
+                store.dispatch(UserLogout());
+              })));
+      }
 
       if (uiState.currentRoute != LoginScreen.route &&
           uiState.currentRoute.isNotEmpty) {
@@ -307,7 +315,11 @@ Middleware<AppState> _createLoadState(
           print('## ERROR (app_middleware - refresh): $error');
           store.dispatch(UserLogout());
         });
-        store.dispatch(RefreshData(completer: completer, clearData: true));
+        if (store.state.company.isLarge) {
+          store.dispatch(LoadClients(completer: completer));
+        } else {
+          store.dispatch(RefreshData(completer: completer, clearData: true));
+        }
       } else {
         store.dispatch(UserLogout());
       }