diff --git a/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.html b/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.html
index ee40622..29c0fab 100644
--- a/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.html
+++ b/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.html
@@ -75,10 +75,10 @@
               data-name$="[[item.name]]"
               data-url$="[[item.url]]"
               on-tap="_handleShowAgreement"
-              disabled$="[[_disableAggreements(item, _groups)]]">
+              disabled$="[[_disableAggreements(item, _groups, _signedAgreements)]]">
           <label id="claNewAgreementsLabel">[[item.name]]</label>
         </span>
-        <div class$="alreadySubmittedText [[_hideAggreements(item, _groups)]]">
+        <div class$="alreadySubmittedText [[_hideAggreements(item, _groups, _signedAgreements)]]">
           Agreement already submitted.
         </div>
         <div class="agreementsUrl">
diff --git a/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.js b/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.js
index d9269c3..5137e2d 100644
--- a/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.js
+++ b/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.js
@@ -104,19 +104,19 @@
       return agreements ? 'show' : '';
     },
 
-    _disableAggreements(item, groups) {
+    _disableAggreements(item, groups, signedAgreements) {
       for (const group of groups) {
         if ((item && item.auto_verify_group &&
             item.auto_verify_group.id === group.id) ||
-            this._signedAgreements.find(i => i.name === item.name)) {
+            signedAgreements.find(i => i.name === item.name)) {
           return true;
         }
       }
       return false;
     },
 
-    _hideAggreements(item, groups) {
-      return this._disableAggreements(item, groups) ?
+    _hideAggreements(item, groups, signedAgreements) {
+      return this._disableAggreements(item, groups, signedAgreements) ?
           '' : 'hide';
     },
 
diff --git a/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view_test.html b/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view_test.html
index e16bf46..6ee6ade 100644
--- a/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view_test.html
+++ b/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view_test.html
@@ -141,22 +141,26 @@
 
     test('_disableAggreements', () => {
       // In the auto verify group and have not yet signed agreement
-      assert.isTrue(element._disableAggreements(auth, groups));
+      assert.isTrue(
+          element._disableAggreements(auth, groups, signedAgreements));
       // Not in the auto verify group and have not yet signed agreement
-      assert.isFalse(element._disableAggreements(auth2, groups));
+      assert.isFalse(
+          element._disableAggreements(auth2, groups, signedAgreements));
       // Not in the auto verify group, have signed agreement
-      assert.isTrue(element._disableAggreements(auth3, groups));
+      assert.isTrue(
+          element._disableAggreements(auth3, groups, signedAgreements));
     });
 
     test('_hideAggreements', () => {
       // Not in the auto verify group and have not yet signed agreement
-      assert.equal(element._hideAggreements(auth, groups), '');
+      assert.equal(
+          element._hideAggreements(auth, groups, signedAgreements), '');
       // In the auto verify group
-      assert.equal(element._hideAggreements(auth2, groups),
-          'hide');
+      assert.equal(
+          element._hideAggreements(auth2, groups, signedAgreements), 'hide');
       // Not in the auto verify group, have signed agreement
-      assert.equal(element._hideAggreements(auth3, groups),
-          '');
+      assert.equal(
+          element._hideAggreements(auth3, groups, signedAgreements), '');
     });
 
     test('_disableAgreementsText', () => {
diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
index f552c50..e07e353 100644
--- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
+++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
@@ -696,7 +696,7 @@
     },
 
     getAccountAgreements() {
-      return this._fetchSharedCacheURL('/accounts/self/agreements');
+      return this.fetchJSON('/accounts/self/agreements');
     },
 
     saveAccountAgreement(name) {