diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js
index 4d62856032..ed12439a9a 100644
--- a/e2e/helpers/extensions.js
+++ b/e2e/helpers/extensions.js
@@ -428,6 +428,16 @@ let actions = {
 
     waitForSpinnerLoad: function() {
         return this.waitUntilNotPresent('vn-topbar vn-spinner');
+    },
+
+    waitForWatcherData: function(selector) {
+        return this.wait(selector)
+            .wait(selector => {
+                const watcher = document.querySelector(selector);
+                let orgData = watcher.$ctrl.orgData;
+                return !angular.equals({}, orgData) && orgData != null;
+            }, selector)
+            .waitForSpinnerLoad();
     }
 };
 
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 7b5b583f6b..1e73f31910 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -118,7 +118,8 @@ export default {
         addObservationButton: 'vn-client-address-edit div[name="observations"] vn-icon-button[icon="add_circle"]',
         saveButton: `button[type=submit]`,
         cancelCreateAddressButton: 'button[ui-sref="client.card.address.index"]',
-        cancelEditAddressButton: 'vn-client-address-edit > form > vn-button-bar > vn-button > button'
+        cancelEditAddressButton: 'vn-client-address-edit > form > vn-button-bar > vn-button > button',
+        watcher: 'vn-client-address-edit vn-watcher'
     },
     clientWebAccess: {
         webAccessButton: 'vn-left-menu a[ui-sref="client.card.webAccess"]',
diff --git a/e2e/paths/02-client-module/03_edit_fiscal_data.spec.js b/e2e/paths/02-client-module/03_edit_fiscal_data.spec.js
index 836ce8976f..c28f0a8fe9 100644
--- a/e2e/paths/02-client-module/03_edit_fiscal_data.spec.js
+++ b/e2e/paths/02-client-module/03_edit_fiscal_data.spec.js
@@ -138,7 +138,7 @@ describe('Client Edit fiscalData path', () => {
         it(`should click on the 1st edit icon to confirm EQtax is checked`, async() => {
             const result = await nightmare
                 .waitToClick(selectors.clientAddresses.firstEditAddress)
-                .waitForSpinnerLoad()
+                .waitForWatcherData(selectors.clientAddresses.watcher)
                 .checkboxState(selectors.clientAddresses.equalizationTaxCheckbox);
 
             expect(result).toBe('checked');
@@ -149,7 +149,7 @@ describe('Client Edit fiscalData path', () => {
             const result = await nightmare
                 .waitToClick(selectors.clientAddresses.addressesButton)
                 .waitToClick(selectors.clientAddresses.secondEditAddress)
-                .waitForSpinnerLoad()
+                .waitForWatcherData(selectors.clientAddresses.watcher)
                 .checkboxState(selectors.clientAddresses.equalizationTaxCheckbox);
 
             expect(result).toBe('checked');