diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart
index cc70e3ebd..5e8c99d9b 100644
--- a/lib/redux/app/app_state.dart
+++ b/lib/redux/app/app_state.dart
@@ -278,8 +278,8 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
   @override
   String toString() {
     //return 'Settings: ${selectedCompanyState.company.settings}';
-    return 'URL: ${authState.url}, ${selectedCompany.plan}';
-    //return 'Is Testing: ${uiState.isTesting}';
+    //return 'URL: ${authState.url}, ${selectedCompany.plan}';
+    return 'Is Loading: $isLoading';
     //return 'Route: ${uiState.currentRoute}, Previous: ${uiState.previousRoute}, Layout: ${uiState.layout}, Menu: ${uiState.isMenuVisible}, History: ${uiState.isHistoryVisible}';
   }
 }
diff --git a/lib/ui/client/client_list.dart b/lib/ui/client/client_list.dart
index 0df3f3521..462bd7411 100644
--- a/lib/ui/client/client_list.dart
+++ b/lib/ui/client/client_list.dart
@@ -20,7 +20,7 @@ class ClientList extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     if (!viewModel.isLoaded) {
-      return LoadingIndicator();
+      return viewModel.isLoading ? LoadingIndicator() : SizedBox();
     } else if (viewModel.clientList.isEmpty) {
       return HelpText(AppLocalization.of(context).noRecordsFound);
     }
diff --git a/lib/ui/dashboard/dashboard_panels.dart b/lib/ui/dashboard/dashboard_panels.dart
index be5f7f3a4..5a88d79a3 100644
--- a/lib/ui/dashboard/dashboard_panels.dart
+++ b/lib/ui/dashboard/dashboard_panels.dart
@@ -121,14 +121,18 @@ class DashboardPanels extends StatelessWidget {
       List<ChartDataGroup> currentData,
       List<ChartDataGroup> previousData,
       bool isLoaded}) {
-    if (!isLoaded) {
-      return LoadingIndicator(useCard: true);
-    }
-
     final localization = AppLocalization.of(context);
     final settings = viewModel.dashboardUIState;
     final state = viewModel.state;
 
+    if (!isLoaded) {
+      if (state.isLoading) {
+        return LoadingIndicator(useCard: true);
+      } else {
+        return SizedBox();
+      }
+    }
+
     currentData.forEach((dataGroup) {
       final index = currentData.indexOf(dataGroup);
       dataGroup.chartSeries = <Series<dynamic, DateTime>>[
diff --git a/lib/ui/expense/expense_list.dart b/lib/ui/expense/expense_list.dart
index 21a3319ca..a496f4a83 100644
--- a/lib/ui/expense/expense_list.dart
+++ b/lib/ui/expense/expense_list.dart
@@ -68,7 +68,7 @@ class ExpenseList extends StatelessWidget {
 
     widgets.add(Expanded(
       child: !viewModel.isLoaded
-          ? LoadingIndicator()
+          ? (viewModel.isLoading ? LoadingIndicator() : SizedBox())
           : RefreshIndicator(
               onRefresh: () => viewModel.onRefreshed(context),
               child: viewModel.expenseList.isEmpty
diff --git a/lib/ui/invoice/invoice_list.dart b/lib/ui/invoice/invoice_list.dart
index 9737ca533..9a5408f82 100644
--- a/lib/ui/invoice/invoice_list.dart
+++ b/lib/ui/invoice/invoice_list.dart
@@ -64,7 +64,7 @@ class InvoiceList extends StatelessWidget {
             : Container(),
         Expanded(
           child: !viewModel.isLoaded
-              ? LoadingIndicator()
+              ? (viewModel.isLoading ? LoadingIndicator() : SizedBox())
               : RefreshIndicator(
                   onRefresh: () => viewModel.onRefreshed(context),
                   child: viewModel.invoiceList.isEmpty
diff --git a/lib/ui/payment/payment_list.dart b/lib/ui/payment/payment_list.dart
index 6493124b9..c5b6dcf80 100644
--- a/lib/ui/payment/payment_list.dart
+++ b/lib/ui/payment/payment_list.dart
@@ -76,7 +76,7 @@ class PaymentList extends StatelessWidget {
             : Container(),
         Expanded(
           child: !viewModel.isLoaded
-              ? LoadingIndicator()
+              ? (viewModel.isLoading ? LoadingIndicator() : SizedBox())
               : RefreshIndicator(
                   onRefresh: () => viewModel.onRefreshed(context),
                   child: viewModel.paymentList.isEmpty
diff --git a/lib/ui/product/product_list.dart b/lib/ui/product/product_list.dart
index 1cfdb2512..c70a4d5de 100644
--- a/lib/ui/product/product_list.dart
+++ b/lib/ui/product/product_list.dart
@@ -20,7 +20,7 @@ class ProductList extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     if (!viewModel.isLoaded) {
-      return LoadingIndicator();
+      return viewModel.isLoading ? LoadingIndicator() : SizedBox();
     } else if (viewModel.productList.isEmpty) {
       return HelpText(AppLocalization.of(context).noRecordsFound);
     }
diff --git a/lib/ui/project/project_list.dart b/lib/ui/project/project_list.dart
index f591db8c3..fa84bad6f 100644
--- a/lib/ui/project/project_list.dart
+++ b/lib/ui/project/project_list.dart
@@ -59,7 +59,7 @@ class ProjectList extends StatelessWidget {
             : Container(),
         Expanded(
           child: !viewModel.isLoaded
-              ? LoadingIndicator()
+              ? (viewModel.isLoading ? LoadingIndicator() : SizedBox())
               : RefreshIndicator(
                   onRefresh: () => viewModel.onRefreshed(context),
                   child: viewModel.projectList.isEmpty
diff --git a/lib/ui/task/task_list.dart b/lib/ui/task/task_list.dart
index e444c82a1..11021dc73 100644
--- a/lib/ui/task/task_list.dart
+++ b/lib/ui/task/task_list.dart
@@ -71,7 +71,7 @@ class TaskList extends StatelessWidget {
             : Container(),
         Expanded(
           child: !viewModel.isLoaded
-              ? LoadingIndicator()
+              ? (viewModel.isLoading ? LoadingIndicator() : SizedBox())
               : RefreshIndicator(
                   onRefresh: () => viewModel.onRefreshed(context),
                   child: viewModel.taskList.isEmpty
diff --git a/lib/ui/vendor/vendor_list.dart b/lib/ui/vendor/vendor_list.dart
index 4e8ed857d..5215d0790 100644
--- a/lib/ui/vendor/vendor_list.dart
+++ b/lib/ui/vendor/vendor_list.dart
@@ -23,7 +23,7 @@ class VendorList extends StatelessWidget {
       children: <Widget>[
         Expanded(
           child: !viewModel.isLoaded
-              ? LoadingIndicator()
+              ? (viewModel.isLoading ? LoadingIndicator() : SizedBox())
               : RefreshIndicator(
                   onRefresh: () => viewModel.onRefreshed(context),
                   child: viewModel.vendorList.isEmpty
diff --git a/stubs/ui/stub/stub_list b/stubs/ui/stub/stub_list
index 9a41936c5..b96254c85 100644
--- a/stubs/ui/stub/stub_list
+++ b/stubs/ui/stub/stub_list
@@ -33,7 +33,7 @@ class StubList extends StatelessWidget {
       
               Expanded(
                 child: !viewModel.isLoaded
-                    ? LoadingIndicator()
+                    ? (viewModel.isLoading ? LoadingIndicator() : SizedBox())
                     : RefreshIndicator(
                         onRefresh: () => viewModel.onRefreshed(context),
                         child: viewModel.stubList.isEmpty