diff --git a/web/src/Setting.js b/web/src/Setting.js
index c1c7618e..e0b16d33 100644
--- a/web/src/Setting.js
+++ b/web/src/Setting.js
@@ -520,10 +520,10 @@ export function getTermsOfUseContent(url, setTermsOfUseContent) {
 export function isAgreementRequired(application) {
   if (application) {
     const agreementItem = application.signupItems.find(item => item.name === "Agreement");
-    if (agreementItem.rule === "None" || !agreementItem.rule) {
+    if (!agreementItem || agreementItem.rule === "None" || !agreementItem.rule) {
       return false;
     }
-    if (agreementItem && agreementItem.required) {
+    if (agreementItem.required) {
       return true;
     }
   }