diff --git a/lib/main.dart b/lib/main.dart
index 42fff4227..2033fd842 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -80,7 +80,7 @@ void main({bool isTesting = false}) async {
         ..addAll(createStoreCompanyGatewaysMiddleware())
         ..addAll(createStoreGroupsMiddleware())
         ..addAll(createStorePersistenceMiddleware())
-        ..addAll(isTesting || kReleaseMode
+        ..addAll(true || isTesting || kReleaseMode
             ? []
             : [
                 LoggingMiddleware<dynamic>.printer(
diff --git a/lib/redux/company/company_reducer.dart b/lib/redux/company/company_reducer.dart
index 57457da5e..257068b61 100644
--- a/lib/redux/company/company_reducer.dart
+++ b/lib/redux/company/company_reducer.dart
@@ -1,5 +1,7 @@
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart';
+import 'package:invoiceninja_flutter/redux/document/document_actions.dart';
+import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart';
 import 'package:invoiceninja_flutter/redux/reports/reports_actions.dart';
 import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart';
 import 'package:redux/redux.dart';
@@ -189,7 +191,7 @@ Reducer<int> lastUpdatedReducer = combineReducers([
         ? state
         : DateTime.now().millisecondsSinceEpoch;
   }),
-  TypedReducer<int, LoadCreditsSuccess>((state, action) {
+  TypedReducer<int, LoadExpensesSuccess>((state, action) {
     return DateTime.now().millisecondsSinceEpoch;
   }),
 ]);
diff --git a/lib/redux/credit/credit_middleware.dart b/lib/redux/credit/credit_middleware.dart
index 375b69a00..d0dd5e2a1 100644
--- a/lib/redux/credit/credit_middleware.dart
+++ b/lib/redux/credit/credit_middleware.dart
@@ -300,7 +300,6 @@ Middleware<AppState> _loadCredit(CreditRepository repository) {
       if (action.completer != null) {
         action.completer.complete(null);
       }
-      store.dispatch(LoadProjects());
     }).catchError((Object error) {
       print(error);
       store.dispatch(LoadCreditFailure(error));
@@ -320,10 +319,10 @@ Middleware<AppState> _loadCredits(CreditRepository repository) {
     store.dispatch(LoadCreditsRequest());
     repository.loadList(store.state.credentials).then((data) {
       store.dispatch(LoadCreditsSuccess(data));
-      store.dispatch(PersistData());
       if (action.completer != null) {
         action.completer.complete(null);
       }
+      store.dispatch(LoadProjects());
     }).catchError((Object error) {
       print(error);
       store.dispatch(LoadCreditsFailure(error));
diff --git a/lib/redux/document/document_middleware.dart b/lib/redux/document/document_middleware.dart
index 180c9e551..463f24a91 100644
--- a/lib/redux/document/document_middleware.dart
+++ b/lib/redux/document/document_middleware.dart
@@ -214,7 +214,6 @@ Middleware<AppState> _loadDocuments(DocumentRepository repository) {
       if (action.completer != null) {
         action.completer.complete(null);
       }
-      //store.dispatch(LoadClients());
     }).catchError((Object error) {
       print(error);
       store.dispatch(LoadDocumentsFailure(error));
diff --git a/lib/redux/expense/expense_middleware.dart b/lib/redux/expense/expense_middleware.dart
index d97ea5d73..2b519bcba 100644
--- a/lib/redux/expense/expense_middleware.dart
+++ b/lib/redux/expense/expense_middleware.dart
@@ -228,7 +228,7 @@ Middleware<AppState> _loadExpenses(ExpenseRepository repository) {
       if (action.completer != null) {
         action.completer.complete(null);
       }
-      store.dispatch(LoadDocuments());
+      store.dispatch(PersistData());
     }).catchError((Object error) {
       print(error);
       store.dispatch(LoadExpensesFailure(error));
diff --git a/pubspec.lock b/pubspec.lock
index 6c7e76039..3a7f11f2d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -865,14 +865,14 @@ packages:
       name: sentry
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.3"
+    version: "4.0.4"
   sentry_flutter:
     dependency: "direct main"
     description:
       name: sentry_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.3"
+    version: "4.0.4"
   share:
     dependency: "direct main"
     description:
@@ -1230,4 +1230,4 @@ packages:
     version: "2.2.1"
 sdks:
   dart: ">=2.12.0-0.0 <3.0.0"
-  flutter: ">=1.22.2 <2.0.0"
+  flutter: ">=1.22.2"