diff --git a/src/logic/safe/store/selectors/index.ts b/src/logic/safe/store/selectors/index.ts
index 0666aa2b7e..0646a7b19e 100644
--- a/src/logic/safe/store/selectors/index.ts
+++ b/src/logic/safe/store/selectors/index.ts
@@ -20,10 +20,12 @@ export const latestMasterContractVersion = createSelector(safesState, (safeState
   safeState.get('latestMasterContractVersion'),
 )
 
-export const currentSafe = createSelector([safesAsMap], (safes: SafesMap) => {
-  const address = extractSafeAddress()
-  return safes.get(address, baseSafe(address))
-})
+export const currentSafe = createSelector(
+  [safesAsMap, () => extractSafeAddress()],
+  (safes: SafesMap, address: string) => {
+    return safes.get(address, baseSafe(address))
+  },
+)
 
 const baseSafe = (address = '') => makeSafe({ address })