diff --git a/changes/fabo_fetch-policy b/changes/fabo_fetch-policy
new file mode 100644
index 0000000000..686b231776
--- /dev/null
+++ b/changes/fabo_fetch-policy
@@ -0,0 +1 @@
+[Fixed] [#3390](https://github.com/cosmos/lunie/pull/3390) Fix ActionModal data being out of date if a live update of data happened @faboweb
\ No newline at end of file
diff --git a/src/ActionModal/components/ActionModal.vue b/src/ActionModal/components/ActionModal.vue
index 55dd65d5d3..cdf44a7cf7 100644
--- a/src/ActionModal/components/ActionModal.vue
+++ b/src/ActionModal/components/ActionModal.vue
@@ -481,7 +481,6 @@ export default {
         userAddress: this.session.address,
         rewards: this.rewards,
         totalRewards: this.overview.totalRewards,
-        delegations: this.delegations,
         bondDenom: this.network.stakingDenom,
         isExtensionAccount: this.isExtensionAccount,
         account: this.overview.accountInformation
@@ -735,7 +734,6 @@ export default {
           overview(networkId: $networkId, address: $address) {
             totalRewards
             liquidStake
-            totalStake
             accountInformation {
               accountNumber
               sequence
@@ -767,11 +765,8 @@ export default {
         query NetworkActionModal($networkId: String!) {
           network(id: $networkId) {
             id
-            testnet
             stakingDenom
             chain_id
-            rpc_url
-            api_url
             action_send
             action_claim_rewards
             action_delegate
@@ -795,39 +790,6 @@ export default {
         return data.network
       }
     },
-    delegations: {
-      query: gql`
-        query DelegationsActionModal(
-          $networkId: String!
-          $delegatorAddress: String!
-        ) {
-          delegations(
-            networkId: $networkId
-            delegatorAddress: $delegatorAddress
-          ) {
-            amount
-            validator {
-              operatorAddress
-            }
-          }
-        }
-      `,
-      skip() {
-        /* istanbul ignore next */
-        return !this.session.address
-      },
-      variables() {
-        /* istanbul ignore next */
-        return {
-          networkId: this.networkId,
-          delegatorAddress: this.session.address
-        }
-      },
-      update(data) {
-        /* istanbul ignore next */
-        return data.delegations
-      }
-    },
     $subscribe: {
       userTransactionAdded: {
         variables() {
diff --git a/src/ActionModal/components/DelegationModal.vue b/src/ActionModal/components/DelegationModal.vue
index 68181799e6..dea82f7a47 100644
--- a/src/ActionModal/components/DelegationModal.vue
+++ b/src/ActionModal/components/DelegationModal.vue
@@ -269,13 +269,11 @@ export default {
       return this.fromSelectedIndex !== `0`
     }
   },
-  mounted() {
-    this.$apollo.queries.balance.refetch()
-    this.$apollo.queries.delegations.refetch()
-  },
   methods: {
     open() {
       this.$refs.actionModal.open()
+      this.$apollo.queries.balance.refetch()
+      this.$apollo.queries.delegations.refetch()
     },
     validateForm() {
       this.$v.$touch()
@@ -398,6 +396,7 @@ export default {
           }
         }
       `,
+      fetchPolicy: "cache-first",
       variables() {
         /* istanbul ignore next */
         return {
@@ -424,11 +423,11 @@ export default {
         return !this.address
       },
       query: UserTransactionAdded,
-      result({ data }) {
+      result() {
         /* istanbul ignore next */
-        if (data.userTransactionAdded.success) {
-          this.$apollo.queries.delegations.refetch()
-        }
+        this.$apollo.queries.balance.refetch()
+        /* istanbul ignore next */
+        this.$apollo.queries.delegations.refetch()
       }
     }
   }
diff --git a/src/ActionModal/components/ModalWithdrawRewards.vue b/src/ActionModal/components/ModalWithdrawRewards.vue
index 415977ecec..6a1be96f12 100644
--- a/src/ActionModal/components/ModalWithdrawRewards.vue
+++ b/src/ActionModal/components/ModalWithdrawRewards.vue
@@ -118,6 +118,7 @@ export default {
           }
         }
       `,
+      fetchPolicy: "cache-first",
       variables() {
         return {
           networkId: this.network
diff --git a/src/ActionModal/components/SendModal.vue b/src/ActionModal/components/SendModal.vue
index 8019ca101a..d66e73f304 100644
--- a/src/ActionModal/components/SendModal.vue
+++ b/src/ActionModal/components/SendModal.vue
@@ -134,6 +134,7 @@ import ActionModal from "./ActionModal"
 import transaction from "../utils/transactionTypes"
 import { toMicroDenom } from "src/scripts/common"
 import config from "src/../config"
+import { UserTransactionAdded } from "src/gql"
 
 const defaultMemo = "(Sent via Lunie)"
 
@@ -189,6 +190,9 @@ export default {
       }
     }
   },
+  mounted() {
+    this.$apollo.queries.balance.refetch()
+  },
   methods: {
     open() {
       this.$refs.actionModal.open()
@@ -280,6 +284,26 @@ export default {
           denom: this.denom
         }
       }
+    },
+    $subscribe: {
+      userTransactionAdded: {
+        variables() {
+          /* istanbul ignore next */
+          return {
+            networkId: this.network,
+            address: this.userAddress
+          }
+        },
+        skip() {
+          /* istanbul ignore next */
+          return !this.userAddress
+        },
+        query: UserTransactionAdded,
+        result() {
+          /* istanbul ignore next */
+          this.$apollo.queries.balance.refetch()
+        }
+      }
     }
   }
 }
diff --git a/src/ActionModal/components/UndelegationModal.vue b/src/ActionModal/components/UndelegationModal.vue
index 7812ece1c6..d82c74fd07 100644
--- a/src/ActionModal/components/UndelegationModal.vue
+++ b/src/ActionModal/components/UndelegationModal.vue
@@ -124,6 +124,7 @@ import TmFormMsg from "src/components/common/TmFormMsg"
 import transaction from "../utils/transactionTypes"
 import { toMicroDenom } from "src/scripts/common"
 import { formatBech32, validatorEntry } from "src/filters"
+import { UserTransactionAdded } from "src/gql"
 
 export default {
   name: `undelegation-modal`,
@@ -266,6 +267,7 @@ export default {
   methods: {
     open() {
       this.$refs.actionModal.open()
+      this.$apollo.queries.delegations.refetch()
     },
     validateForm() {
       this.$v.$touch()
@@ -331,6 +333,7 @@ export default {
           }
         }
       `,
+      fetchPolicy: "cache-first",
       variables() {
         /* istanbul ignore next */
         return {
@@ -363,6 +366,27 @@ export default {
         /* istanbul ignore next */
         return data.validators
       }
+    },
+
+    $subscribe: {
+      userTransactionAdded: {
+        variables() {
+          /* istanbul ignore next */
+          return {
+            networkId: this.network,
+            address: this.userAddress
+          }
+        },
+        skip() {
+          /* istanbul ignore next */
+          return !this.userAddress
+        },
+        query: UserTransactionAdded,
+        result() {
+          /* istanbul ignore next */
+          this.$apollo.queries.delegations.refetch()
+        }
+      }
     }
   }
 }
diff --git a/src/components/common/TmBalance.vue b/src/components/common/TmBalance.vue
index 9e67ea944e..57000d20e3 100644
--- a/src/components/common/TmBalance.vue
+++ b/src/components/common/TmBalance.vue
@@ -53,12 +53,10 @@
 </template>
 <script>
 import { shortDecimals } from "scripts/num"
-import refetchNetworkOnly from "scripts/refetch-network-only"
 import { noBlanks } from "src/filters"
 import TmBtn from "common/TmBtn"
 import SendModal from "src/ActionModal/components/SendModal"
 import ModalWithdrawRewards from "src/ActionModal/components/ModalWithdrawRewards"
-import { UserTransactionAdded } from "src/gql"
 import { mapGetters } from "vuex"
 import gql from "graphql-tag"
 export default {
@@ -143,22 +141,6 @@ export default {
       }
     },
     $subscribe: {
-      userTransactionAdded: {
-        variables() {
-          return {
-            networkId: this.network,
-            address: this.address
-          }
-        },
-        skip() {
-          return !this.address
-        },
-        query: UserTransactionAdded,
-        result() {
-          // query if successful or not as even an unsuccessful tx costs fees
-          refetchNetworkOnly(this.$apollo.queries.overview)
-        }
-      },
       blockAdded: {
         variables() {
           return {
@@ -176,7 +158,8 @@ export default {
           `
         },
         result() {
-          refetchNetworkOnly(this.$apollo.queries.overview)
+          /* istanbul ignore next */
+          this.$apollo.queries.overview.refetch()
         }
       }
     }
diff --git a/src/components/governance/PageProposal.vue b/src/components/governance/PageProposal.vue
index 5382c048ce..d4ed414b8b 100644
--- a/src/components/governance/PageProposal.vue
+++ b/src/components/governance/PageProposal.vue
@@ -196,7 +196,6 @@ import { ProposalItem, GovernanceParameters, Vote } from "src/gql"
 import BigNumber from "bignumber.js"
 import Bech32 from "common/Bech32"
 import gql from "graphql-tag"
-import refetchNetworkOnly from "scripts/refetch-network-only"
 
 export default {
   name: `page-proposal`,
@@ -270,20 +269,13 @@ export default {
       this.$refs.modalVote.open()
     },
     afterVote() {
-      this.$apollo.queries.vote.refetch({
-        proposalId: this.proposal.id,
-        address: this.address
-      })
-      this.$store.commit("invalidateCache", [`overview`, `transactions`])
+      this.$apollo.queries.vote.refetch()
     },
     onDeposit() {
       this.$refs.modalDeposit.open()
     },
     afterDeposit() {
-      this.$apollo.queries.proposal.refetch({
-        id: this.proposal.id
-      })
-      this.$store.commit("invalidateCache", [`overview`, `transactions`])
+      this.$apollo.queries.proposal.refetch()
     },
     getProposalIndex(num) {
       let proposalsObj = this.proposals
@@ -424,9 +416,9 @@ export default {
             this.proposal.status !== "Rejected" &&
             this.loaded
           ) {
-            refetchNetworkOnly(this.$apollo.queries.proposal)
-            refetchNetworkOnly(this.$apollo.queries.parameters)
-            refetchNetworkOnly(this.$apollo.queries.vote)
+            this.$apollo.queries.proposal.refetch()
+            this.$apollo.queries.parameters.refetch()
+            this.$apollo.queries.vote.refetch()
           }
         }
       }
diff --git a/src/components/governance/PageProposals.vue b/src/components/governance/PageProposals.vue
index 3dc86698b5..a4df8f0ceb 100644
--- a/src/components/governance/PageProposals.vue
+++ b/src/components/governance/PageProposals.vue
@@ -44,7 +44,6 @@ import TmDataMsg from "common/TmDataMsg"
 import { mapGetters } from "vuex"
 import { GovernanceParameters } from "src/gql"
 import gql from "graphql-tag"
-import refetchNetworkOnly from "scripts/refetch-network-only"
 
 export default {
   name: `page-proposals`,
@@ -71,7 +70,6 @@ export default {
     },
     afterPropose() {
       this.$apollo.queries.proposals.refetch()
-      this.$store.commit("invalidateCache", [`overview`, `transactions`])
     }
   },
   apollo: {
@@ -133,7 +131,7 @@ export default {
         },
         result() {
           /* istanbul ignore next */
-          refetchNetworkOnly(this.$apollo.queries.proposals)
+          this.$apollo.queries.proposals.refetch()
         }
       }
     }
diff --git a/src/components/network/PageNetworks.vue b/src/components/network/PageNetworks.vue
index 457c56abd4..3dfa139957 100644
--- a/src/components/network/PageNetworks.vue
+++ b/src/components/network/PageNetworks.vue
@@ -37,6 +37,7 @@ export default {
   apollo: {
     networks: {
       query: Networks,
+      fetchPolicy: "cache-first",
       update: NetworksResult
     }
   }
diff --git a/src/components/staking/DelegationsOverview.vue b/src/components/staking/DelegationsOverview.vue
index fe926b8a89..af60020f4a 100644
--- a/src/components/staking/DelegationsOverview.vue
+++ b/src/components/staking/DelegationsOverview.vue
@@ -38,7 +38,6 @@ import { mapGetters } from "vuex"
 import TmDataMsg from "common/TmDataMsg"
 import TableValidators from "staking/TableValidators"
 import { DelegationsForDelegator, UserTransactionAdded } from "src/gql"
-import refetchNetworkOnly from "scripts/refetch-network-only"
 
 export default {
   name: `delegations-overview`,
@@ -82,8 +81,9 @@ export default {
         },
         query: UserTransactionAdded,
         result({ data }) {
+          /* istanbul ignore next */
           if (data.userTransactionAdded.success) {
-            refetchNetworkOnly(this.$apollo.queries.delegations)
+            this.$apollo.queries.delegations.refetch()
           }
         }
       }
diff --git a/src/components/staking/PageValidator.vue b/src/components/staking/PageValidator.vue
index 6e1d717a38..ea0a3bbf79 100644
--- a/src/components/staking/PageValidator.vue
+++ b/src/components/staking/PageValidator.vue
@@ -154,15 +154,10 @@
         </li>
       </ul>
 
-      <DelegationModal
-        ref="delegationModal"
-        :target-validator="validator"
-        @success="clearDelegationCache"
-      />
+      <DelegationModal ref="delegationModal" :target-validator="validator" />
       <UndelegationModal
         ref="undelegationModal"
         :source-validator="validator"
-        @success="clearUndelegationCache"
       />
     </template>
     <template v-else>
@@ -181,7 +176,6 @@ import moment from "moment"
 import { mapGetters, mapState } from "vuex"
 import { atoms, shortDecimals, fullDecimals, percent } from "scripts/num"
 import { noBlanks, fromNow } from "src/filters"
-import refetchNetworkOnly from "scripts/refetch-network-only"
 import TmBtn from "common/TmBtn"
 import DelegationModal from "src/ActionModal/components/DelegationModal"
 import UndelegationModal from "src/ActionModal/components/UndelegationModal"
@@ -256,21 +250,6 @@ export default {
     onUndelegation() {
       this.$refs.undelegationModal.open()
     },
-    clearDelegationCache() {
-      this.$store.commit("invalidateCache", [
-        `overview`,
-        `delegations`,
-        `transactions`
-      ]) // TODO use more finegrained query string (network and address)
-    },
-    clearUndelegationCache() {
-      this.$store.commit("invalidateCache", [
-        `overview`,
-        `delegations`,
-        `undelegations`,
-        `transactions`
-      ]) // TODO use more finegrained query string (network and address)
-    },
     isBlankField(field, alternateFilter) {
       return field ? alternateFilter(field) : noBlanks(field)
     }
@@ -355,15 +334,13 @@ export default {
         }
       },
       update(result) {
+        /* istanbul ignore next */
+        this.loaded = true
         /* istanbul ignore next */
         return {
           ...result.validator,
           statusDetailed: getStatusText(result.validator.statusDetailed)
         }
-      },
-      result(queryResult) {
-        /* istanbul ignore next */
-        this.loaded = !!queryResult.data.validator
       }
     },
     $subscribe: {
@@ -386,7 +363,7 @@ export default {
         },
         result() {
           /* istanbul ignore next */
-          refetchNetworkOnly(this.$apollo.queries.rewards)
+          this.$apollo.queries.rewards.refetch()
         }
       },
       userTransactionAdded: {
@@ -405,7 +382,7 @@ export default {
         result({ data }) {
           /* istanbul ignore next */
           if (data.userTransactionAdded.success) {
-            refetchNetworkOnly(this.$apollo.queries.delegation)
+            this.$apollo.queries.delegation.refetch()
           }
         }
       }
diff --git a/src/components/staking/TableValidators.vue b/src/components/staking/TableValidators.vue
index 5f8bb227f6..abb36d3895 100644
--- a/src/components/staking/TableValidators.vue
+++ b/src/components/staking/TableValidators.vue
@@ -29,7 +29,6 @@
 
 <script>
 import { mapGetters } from "vuex"
-import refetchNetworkOnly from "scripts/refetch-network-only"
 import orderBy from "lodash.orderby"
 import LiValidator from "staking/LiValidator"
 import PanelSort from "staking/PanelSort"
@@ -172,7 +171,8 @@ export default {
           `
         },
         result() {
-          refetchNetworkOnly(this.$apollo.queries.rewards)
+          /* istanbul ignore next */
+          this.$apollo.queries.rewards.refetch()
         }
       }
     }
diff --git a/src/components/staking/Undelegations.vue b/src/components/staking/Undelegations.vue
index 34f2bd68ed..bcbf9f956c 100644
--- a/src/components/staking/Undelegations.vue
+++ b/src/components/staking/Undelegations.vue
@@ -16,7 +16,6 @@
 <script>
 import { mapGetters } from "vuex"
 import TableUndelegations from "staking/TableUndelegations"
-import refetchNetworkOnly from "scripts/refetch-network-only"
 import { ValidatorFragment, UserTransactionAdded } from "src/gql"
 import gql from "graphql-tag"
 
@@ -77,7 +76,7 @@ export default {
         result({ data }) {
           /* istanbul ignore next */
           if (data.userTransactionAdded.success) {
-            refetchNetworkOnly(this.$apollo.queries.undelegations)
+            this.$apollo.queries.undelegations.refetch()
           }
         }
       }
diff --git a/src/gql/apollo.js b/src/gql/apollo.js
index 942b885ab1..ff9a1a5416 100644
--- a/src/gql/apollo.js
+++ b/src/gql/apollo.js
@@ -63,6 +63,12 @@ const createApolloClient = urlParams => {
 
 export const createApolloProvider = urlParams => {
   return new VueApollo({
-    defaultClient: createApolloClient(urlParams)
+    defaultClient: createApolloClient(urlParams),
+    defaultOptions: {
+      // apollo options applied to all queries in components
+      $query: {
+        fetchPolicy: "cache-and-network"
+      }
+    }
   })
 }
diff --git a/src/scripts/refetch-network-only.js b/src/scripts/refetch-network-only.js
deleted file mode 100644
index b0a3d5de31..0000000000
--- a/src/scripts/refetch-network-only.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// when refetching always force to load from the network
-export default apolloQuery => {
-  apolloQuery.setOptions({
-    fetchPolicy: "network-only"
-  })
-  apolloQuery.refetch()
-  apolloQuery.setOptions({
-    fetchPolicy: "cache-and-network"
-  })
-}
diff --git a/src/vuex/modules/connection.js b/src/vuex/modules/connection.js
index 9ee2c415b7..7a93ce0cb5 100644
--- a/src/vuex/modules/connection.js
+++ b/src/vuex/modules/connection.js
@@ -21,7 +21,8 @@ export default function({ apollo }) {
     async checkForPersistedNetwork({ dispatch, commit }) {
       const persistedNetwork = JSON.parse(localStorage.getItem(`network`))
       const { data } = await apollo.query({
-        query: Networks
+        query: Networks,
+        fetchPolicy: "cache-first"
       })
       let availNetworks = Object.values(data.networks).map(
         network => network.id
diff --git a/src/vuex/modules/session.js b/src/vuex/modules/session.js
index 278e5faecf..142dd734f1 100644
--- a/src/vuex/modules/session.js
+++ b/src/vuex/modules/session.js
@@ -1,7 +1,7 @@
 import { track, deanonymize, anonymize } from "scripts/google-analytics"
 import config from "src/../config"
 
-export default ({ apollo }) => {
+export default () => {
   const USER_PREFERENCES_KEY = `lunie_user_preferences`
 
   const state = {
@@ -71,19 +71,6 @@ export default ({ apollo }) => {
     },
     setCurrrentModalOpen(state, modal) {
       state.currrentModalOpen = modal
-    },
-
-    // TODO to own store module?
-    // clear the cache manually so we can force reloading of stale data in not mounted components
-    invalidateCache(state, queries) {
-      let rootQuery = apollo.cache.data.data.ROOT_QUERY
-      Object.keys(rootQuery)
-        .filter(query =>
-          queries.find(queryToClear => query.startsWith(queryToClear))
-        )
-        .forEach(query => {
-          delete rootQuery[query]
-        })
     }
   }
 
diff --git a/tests/unit/specs/components/ActionModal/components/DelegationModal.spec.js b/tests/unit/specs/components/ActionModal/components/DelegationModal.spec.js
index af07ea4df7..67d74fdf32 100644
--- a/tests/unit/specs/components/ActionModal/components/DelegationModal.spec.js
+++ b/tests/unit/specs/components/ActionModal/components/DelegationModal.spec.js
@@ -95,9 +95,10 @@ describe(`DelegationModal`, () => {
     expect(self.$refs.actionModal.validateChangeStep).toHaveBeenCalled()
   })
 
-  it(`opens`, () => {
+  it.only(`opens`, () => {
     const $refs = { actionModal: { open: jest.fn() } }
-    DelegationModal.methods.open.call({ $refs })
+    const $apollo = wrapper.vm.$apollo
+    DelegationModal.methods.open.call({ $refs, $apollo })
     expect($refs.actionModal.open).toHaveBeenCalled()
   })
 
diff --git a/tests/unit/specs/components/ActionModal/components/SendModal.spec.js b/tests/unit/specs/components/ActionModal/components/SendModal.spec.js
index b98f3190d7..c7b85d8368 100644
--- a/tests/unit/specs/components/ActionModal/components/SendModal.spec.js
+++ b/tests/unit/specs/components/ActionModal/components/SendModal.spec.js
@@ -27,7 +27,14 @@ describe(`SendModal`, () => {
     wrapper = shallowMount(SendModal, {
       localVue,
       mocks: {
-        $store
+        $store,
+        $apollo: {
+          queries: {
+            balance: {
+              refetch: () => {}
+            }
+          }
+        }
       },
       propsData: {
         denom: "STAKE"
diff --git a/tests/unit/specs/components/ActionModal/components/UndelegationModal.spec.js b/tests/unit/specs/components/ActionModal/components/UndelegationModal.spec.js
index 41e86bdb2d..7928ccf13d 100644
--- a/tests/unit/specs/components/ActionModal/components/UndelegationModal.spec.js
+++ b/tests/unit/specs/components/ActionModal/components/UndelegationModal.spec.js
@@ -58,7 +58,8 @@ describe(`UndelegationModal`, () => {
 
   it(`opens`, () => {
     const $refs = { actionModal: { open: jest.fn() } }
-    UndelegationModal.methods.open.call({ $refs })
+    const $apollo = { queries: { delegations: { refetch: jest.fn() } } }
+    UndelegationModal.methods.open.call({ $refs, $apollo })
     expect($refs.actionModal.open).toHaveBeenCalled()
   })
 
diff --git a/tests/unit/specs/components/governance/PageProposal.spec.js b/tests/unit/specs/components/governance/PageProposal.spec.js
index c10a7c2c55..0b6df2fada 100644
--- a/tests/unit/specs/components/governance/PageProposal.spec.js
+++ b/tests/unit/specs/components/governance/PageProposal.spec.js
@@ -194,10 +194,7 @@ describe(`PageProposal`, () => {
     it(`refetches user vote after a successful voting`, () => {
       wrapper.vm.$apollo.queries.vote.refetch = jest.fn()
       wrapper.vm.afterVote()
-      expect(wrapper.vm.$apollo.queries.vote.refetch).toHaveBeenCalledWith({
-        proposalId: 33,
-        address: "cosmos1xxxx"
-      })
+      expect(wrapper.vm.$apollo.queries.vote.refetch).toHaveBeenCalled()
     })
   })
 
@@ -215,9 +212,7 @@ describe(`PageProposal`, () => {
     it(`refetches proposal data after a successful depositing`, () => {
       wrapper.vm.$apollo.queries.proposal.refetch = jest.fn()
       wrapper.vm.afterDeposit()
-      expect(wrapper.vm.$apollo.queries.proposal.refetch).toHaveBeenCalledWith({
-        id: 33
-      })
+      expect(wrapper.vm.$apollo.queries.proposal.refetch).toHaveBeenCalled()
     })
   })
 })