diff --git a/src/store/account.js b/src/store/account.js
index b53184f5..eff7f296 100644
--- a/src/store/account.js
+++ b/src/store/account.js
@@ -31,7 +31,10 @@ export function loadAllAccounts(context, { force }) {
             }
 
             context.commit(LOAD_ACCOUNT_LIST, data.result);
-            context.commit(UPDATE_ACCOUNT_LIST_INVALID_STATE, false);
+
+            if (context.state.accountListStateInvalid) {
+                context.commit(UPDATE_ACCOUNT_LIST_INVALID_STATE, false);
+            }
 
             resolve(data.result);
         }).catch(error => {
@@ -138,7 +141,10 @@ export function changeAccountDisplayOrder(context, { accountId, from, to }) {
             return;
         }
 
-        context.commit(UPDATE_ACCOUNT_LIST_INVALID_STATE, true);
+        if (!context.state.accountListStateInvalid) {
+            context.commit(UPDATE_ACCOUNT_LIST_INVALID_STATE, true);
+        }
+
         context.commit(CHANGE_ACCOUNT_DISPLAY_ORDER_IN_ACCOUNT_LIST, {
             account: account,
             from: from,
@@ -178,7 +184,9 @@ export function updateAccountDisplayOrders(context) {
                 return;
             }
 
-            context.commit(UPDATE_ACCOUNT_LIST_INVALID_STATE, false);
+            if (context.state.accountListStateInvalid) {
+                context.commit(UPDATE_ACCOUNT_LIST_INVALID_STATE, false);
+            }
 
             resolve(data.result);
         }).catch(error => {
diff --git a/src/store/transaction.js b/src/store/transaction.js
index 97db8f59..daf32345 100644
--- a/src/store/transaction.js
+++ b/src/store/transaction.js
@@ -57,7 +57,10 @@ export function getTransactions(context, { reload, autoExpand, defaultCurrency }
                         autoExpand: autoExpand,
                         defaultCurrency: defaultCurrency
                     });
-                    context.commit(UPDATE_TRANSACTION_LIST_INVALID_STATE, true);
+
+                    if (!context.state.transactionListStateInvalid) {
+                        context.commit(UPDATE_TRANSACTION_LIST_INVALID_STATE, true);
+                    }
                 }
 
                 reject({ message: 'Unable to get transaction list' });
@@ -72,7 +75,9 @@ export function getTransactions(context, { reload, autoExpand, defaultCurrency }
             });
 
             if (reload) {
-                context.commit(UPDATE_TRANSACTION_LIST_INVALID_STATE, false);
+                if (context.state.transactionListStateInvalid) {
+                    context.commit(UPDATE_TRANSACTION_LIST_INVALID_STATE, false);
+                }
             }
 
             resolve(data.result);
@@ -86,7 +91,10 @@ export function getTransactions(context, { reload, autoExpand, defaultCurrency }
                     autoExpand: autoExpand,
                     defaultCurrency: defaultCurrency
                 });
-                context.commit(UPDATE_TRANSACTION_LIST_INVALID_STATE, true);
+
+                if (!context.state.transactionListStateInvalid) {
+                    context.commit(UPDATE_TRANSACTION_LIST_INVALID_STATE, true);
+                }
             }
 
             if (error.response && error.response.data && error.response.data.errorMessage) {
@@ -150,7 +158,9 @@ export function saveTransaction(context, { transaction, defaultCurrency }) {
             }
 
             if (!transaction.id) {
-                context.commit(UPDATE_TRANSACTION_LIST_INVALID_STATE, true);
+                if (!context.state.transactionListStateInvalid) {
+                    context.commit(UPDATE_TRANSACTION_LIST_INVALID_STATE, true);
+                }
             } else {
                 context.commit(SAVE_TRANSACTION_IN_TRANSACTION_LIST, {
                     transaction: data.result,
diff --git a/src/store/transactionCategory.js b/src/store/transactionCategory.js
index b78a9a1f..9b3c956e 100644
--- a/src/store/transactionCategory.js
+++ b/src/store/transactionCategory.js
@@ -57,7 +57,10 @@ export function loadAllCategories(context, { force }) {
             }
 
             context.commit(LOAD_TRANSACTION_CATEGORY_LIST, data.result);
-            context.commit(UPDATE_TRANSACTION_CATEGORY_LIST_INVALID_STATE, false);
+
+            if (context.state.transactionCategoryListStateInvalid) {
+                context.commit(UPDATE_TRANSACTION_CATEGORY_LIST_INVALID_STATE, false);
+            }
 
             resolve(data.result);
         }).catch(error => {
@@ -168,7 +171,9 @@ export function addCategories(context, { categories }) {
                 return;
             }
 
-            context.commit(UPDATE_TRANSACTION_CATEGORY_LIST_INVALID_STATE, true);
+            if (!context.state.transactionCategoryListStateInvalid) {
+                context.commit(UPDATE_TRANSACTION_CATEGORY_LIST_INVALID_STATE, true);
+            }
 
             resolve(data.result);
         }).catch(error => {
@@ -208,7 +213,10 @@ export function changeCategoryDisplayOrder(context, { categoryId, from, to }) {
             }
         }
 
-        context.commit(UPDATE_TRANSACTION_CATEGORY_LIST_INVALID_STATE, true);
+        if (!context.state.transactionCategoryListStateInvalid) {
+            context.commit(UPDATE_TRANSACTION_CATEGORY_LIST_INVALID_STATE, true);
+        }
+
         context.commit(CHANGE_CATEGORY_DISPLAY_ORDER_IN_CATEGORY_LIST, {
             category: category,
             from: from,
@@ -250,7 +258,9 @@ export function updateCategoryDisplayOrders(context, { type, parentId }) {
                 return;
             }
 
-            context.commit(UPDATE_TRANSACTION_CATEGORY_LIST_INVALID_STATE, false);
+            if (context.state.transactionCategoryListStateInvalid) {
+                context.commit(UPDATE_TRANSACTION_CATEGORY_LIST_INVALID_STATE, false);
+            }
 
             resolve(data.result);
         }).catch(error => {
diff --git a/src/store/transactionTag.js b/src/store/transactionTag.js
index cbb67b96..400044c8 100644
--- a/src/store/transactionTag.js
+++ b/src/store/transactionTag.js
@@ -28,7 +28,10 @@ export function loadAllTags(context, { force }) {
             }
 
             context.commit(LOAD_TRANSACTION_TAG_LIST, data.result);
-            context.commit(UPDATE_TRANSACTION_TAG_LIST_INVALID_STATE, false);
+
+            if (context.state.transactionTagListStateInvalid) {
+                context.commit(UPDATE_TRANSACTION_TAG_LIST_INVALID_STATE, false);
+            }
 
             resolve(data.result);
         }).catch(error => {
@@ -112,7 +115,10 @@ export function changeTagDisplayOrder(context, { tagId, from, to }) {
             return;
         }
 
-        context.commit(UPDATE_TRANSACTION_TAG_LIST_INVALID_STATE, true);
+        if (!context.state.transactionTagListStateInvalid) {
+            context.commit(UPDATE_TRANSACTION_TAG_LIST_INVALID_STATE, true);
+        }
+
         context.commit(CHANGE_TAG_DISPLAY_ORDER_IN_TRANSACTION_TAG_LIST, {
             tag: tag,
             from: from,
@@ -144,7 +150,9 @@ export function updateTagDisplayOrders(context) {
                 return;
             }
 
-            context.commit(UPDATE_TRANSACTION_TAG_LIST_INVALID_STATE, false);
+            if (context.state.transactionTagListStateInvalid) {
+                context.commit(UPDATE_TRANSACTION_TAG_LIST_INVALID_STATE, false);
+            }
 
             resolve(data.result);
         }).catch(error => {