diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
index 36d3e55d85..e087408425 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
@@ -211,8 +211,8 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
             // User accepted all terms
             this.setState({
                 requiredPolicyInfo: {
+                    ...this.state.requiredPolicyInfo, // set first so we can override
                     hasTerms: false,
-                    ...this.state.requiredPolicyInfo,
                 },
             });
         } catch (e) {