diff --git a/src/IdentityAuthClient.js b/src/IdentityAuthClient.js
index 075ae93709..7cbad074bf 100644
--- a/src/IdentityAuthClient.js
+++ b/src/IdentityAuthClient.js
@@ -65,7 +65,7 @@ export default class IdentityAuthClient {
     }
 
     // Returns a promise that resolves to the access_token string from the IS
-    async getAccessToken(check=true) {
+    async getAccessToken({ check = true } = {}) {
         if (!this.authEnabled) {
             // The current IS doesn't support authentication
             return null;
diff --git a/src/boundThreepids.js b/src/boundThreepids.js
index 90a5bd2a6f..7f727d8e64 100644
--- a/src/boundThreepids.js
+++ b/src/boundThreepids.js
@@ -26,26 +26,31 @@ export async function getThreepidsWithBindStatus(client, filterMedium) {
 
     // Check bind status assuming we have an IS and terms are agreed
     if (threepids.length > 0 && client.getIdentityServerUrl()) {
-        // TODO: Handle terms agreement
-        // See https://github.com/vector-im/riot-web/issues/10522
-        const authClient = new IdentityAuthClient();
-        const identityAccessToken = await authClient.getAccessToken();
+        try {
+            const authClient = new IdentityAuthClient();
+            const identityAccessToken = await authClient.getAccessToken({ check: false });
 
-        // Restructure for lookup query
-        const query = threepids.map(({ medium, address }) => [medium, address]);
-        const lookupResults = await client.bulkLookupThreePids(query, identityAccessToken);
+            // Restructure for lookup query
+            const query = threepids.map(({ medium, address }) => [medium, address]);
+            const lookupResults = await client.bulkLookupThreePids(query, identityAccessToken);
 
-        // Record which are already bound
-        for (const [medium, address, mxid] of lookupResults.threepids) {
-            if (mxid !== userId) {
-                continue;
+            // Record which are already bound
+            for (const [medium, address, mxid] of lookupResults.threepids) {
+                if (mxid !== userId) {
+                    continue;
+                }
+                if (filterMedium && medium !== filterMedium) {
+                    continue;
+                }
+                const threepid = threepids.find(e => e.medium === medium && e.address === address);
+                if (!threepid) continue;
+                threepid.bound = true;
             }
-            if (filterMedium && medium !== filterMedium) {
-                continue;
+        } catch (e) {
+            // Ignore terms errors here and assume other flows handle this
+            if (!(e.errcode === "M_TERMS_NOT_SIGNED")) {
+                throw e;
             }
-            const threepid = threepids.find(e => e.medium === medium && e.address === address);
-            if (!threepid) continue;
-            threepid.bound = true;
         }
     }
 
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 02f9cf3cd3..f1ca314f13 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -110,7 +110,7 @@ export default class GeneralUserSettingsTab extends React.Component {
         // By starting the terms flow we get the logic for checking which terms the user has signed
         // for free. So we might as well use that for our own purposes.
         const authClient = new IdentityAuthClient();
-        const idAccessToken = await authClient.getAccessToken(/*check=*/false);
+        const idAccessToken = await authClient.getAccessToken({ check: false });
         startTermsFlow([new Service(
             SERVICE_TYPES.IS,
             MatrixClientPeg.get().getIdentityServerUrl(),