diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart
index 69c4c2ec4..9d346fc20 100644
--- a/lib/redux/app/app_state.dart
+++ b/lib/redux/app/app_state.dart
@@ -431,12 +431,13 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
   String toString() {
     //return 'Custom fields [UI]: ${uiState.settingsUIState.userCompany.company.customFields}, [DB] ${selectedCompany.customFields}';
     //return 'Permissions: ${uiState.userUIState.editing.id}';
-    return 'Layout: ${uiState.layout}';
+    //return 'Layout: ${uiState.layout}';
     //return 'Sidebars - isMenuVisible: ${uiState.isMenuVisible}, isHistoryVisible: ${uiState.isHistoryVisible}';
     //return 'Gateway: ${uiState.companyGatewayUIState.editing.feesAndLimitsMap}';
     //return 'Routes: Current: ${uiState.currentRoute} Prev: ${uiState.previousRoute}';
     //return 'Route: ${uiState.currentRoute}, Setting Type: ${uiState.settingsUIState.entityType}, Name: ${uiState.settingsUIState.settings.name}, Updated: ${uiState.settingsUIState.updatedAt}';
     //return 'Route: ${uiState.currentRoute}, Previous: ${uiState.previousRoute}, Layout: ${uiState.layout}, Menu: ${uiState.isMenuVisible}, History: ${uiState.isHistoryVisible}';
+    return 'Route: ${uiState.currentRoute} Prev: ${uiState.previousRoute}';
   }
 }
 
diff --git a/lib/redux/quote/quote_middleware.dart b/lib/redux/quote/quote_middleware.dart
index 4e21b3bd4..2666a7ba1 100644
--- a/lib/redux/quote/quote_middleware.dart
+++ b/lib/redux/quote/quote_middleware.dart
@@ -10,6 +10,7 @@ import 'package:invoiceninja_flutter/ui/quote/quote_email_vm.dart';
 import 'package:invoiceninja_flutter/ui/quote/quote_screen.dart';
 import 'package:invoiceninja_flutter/ui/quote/view/quote_view_vm.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
+import 'package:invoiceninja_flutter/.env.dart';
 import 'package:redux/redux.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/data/repositories/quote_repository.dart';
@@ -353,15 +354,16 @@ Middleware<AppState> _loadQuotes(QuoteRepository repository) {
       if (action.completer != null) {
         action.completer.complete(null);
       }
-      // TODO update once supported
-      if (state.dashboardState.isStale) {
-        store.dispatch(LoadDashboard());
+      // TODO remove once all modules are supported
+      if (Config.DEMO_MODE) {
+        if (state.projectState.isStale) {
+          store.dispatch(LoadProjects());
+        }
+      } else {
+        if (state.dashboardState.isStale) {
+          store.dispatch(LoadDashboard());
+        }
       }
-      /*
-      if (state.projectState.isStale) {
-        store.dispatch(LoadProjects());
-      }
-       */
     }).catchError((Object error) {
       print(error);
       store.dispatch(LoadQuotesFailure(error));