diff --git a/client/components/settings/attachmentSettings.js b/client/components/settings/attachmentSettings.js
index 35e13c0e5..7f253b2c8 100644
--- a/client/components/settings/attachmentSettings.js
+++ b/client/components/settings/attachmentSettings.js
@@ -4,15 +4,31 @@ import { TAPi18n } from '/imports/i18n';
 // Template helpers for attachmentSettings
 Template.attachmentSettings.helpers({
   loading() {
+    const instance = Template.instance();
+    if (instance && instance.loading) {
+      return instance.loading.get();
+    }
     return attachmentSettings.loading.get();
   },
   showStorageSettings() {
+    const instance = Template.instance();
+    if (instance && instance.showStorageSettings) {
+      return instance.showStorageSettings.get();
+    }
     return attachmentSettings.showStorageSettings.get();
   },
   showMigration() {
+    const instance = Template.instance();
+    if (instance && instance.showMigration) {
+      return instance.showMigration.get();
+    }
     return attachmentSettings.showMigration.get();
   },
   showMonitoring() {
+    const instance = Template.instance();
+    if (instance && instance.showMonitoring) {
+      return instance.showMonitoring.get();
+    }
     return attachmentSettings.showMonitoring.get();
   }
 });
diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js
index c536c3a17..91beb5944 100644
--- a/client/components/settings/settingBody.js
+++ b/client/components/settings/settingBody.js
@@ -7,47 +7,80 @@ import LockoutSettings from '/models/lockoutSettings';
 Template.setting.helpers({
   generalSetting() {
     const instance = Template.instance();
-    return instance && instance.generalSetting ? instance.generalSetting.get() : false;
+    if (instance && instance.generalSetting) {
+      return instance.generalSetting.get();
+    }
+    return false;
   },
   emailSetting() {
     const instance = Template.instance();
-    return instance && instance.emailSetting ? instance.emailSetting.get() : false;
+    if (instance && instance.emailSetting) {
+      return instance.emailSetting.get();
+    }
+    return false;
   },
   accountSetting() {
     const instance = Template.instance();
-    return instance && instance.accountSetting ? instance.accountSetting.get() : false;
+    if (instance && instance.accountSetting) {
+      return instance.accountSetting.get();
+    }
+    return false;
   },
   tableVisibilityModeSetting() {
     const instance = Template.instance();
-    return instance && instance.tableVisibilityModeSetting ? instance.tableVisibilityModeSetting.get() : false;
+    if (instance && instance.tableVisibilityModeSetting) {
+      return instance.tableVisibilityModeSetting.get();
+    }
+    return false;
   },
   announcementSetting() {
     const instance = Template.instance();
-    return instance && instance.announcementSetting ? instance.announcementSetting.get() : false;
+    if (instance && instance.announcementSetting) {
+      return instance.announcementSetting.get();
+    }
+    return false;
   },
   accessibilitySetting() {
     const instance = Template.instance();
-    return instance && instance.accessibilitySetting ? instance.accessibilitySetting.get() : false;
+    if (instance && instance.accessibilitySetting) {
+      return instance.accessibilitySetting.get();
+    }
+    return false;
   },
   layoutSetting() {
     const instance = Template.instance();
-    return instance && instance.layoutSetting ? instance.layoutSetting.get() : false;
+    if (instance && instance.layoutSetting) {
+      return instance.layoutSetting.get();
+    }
+    return false;
   },
   webhookSetting() {
     const instance = Template.instance();
-    return instance && instance.webhookSetting ? instance.webhookSetting.get() : false;
+    if (instance && instance.webhookSetting) {
+      return instance.webhookSetting.get();
+    }
+    return false;
   },
   attachmentSettings() {
     const instance = Template.instance();
-    return instance && instance.attachmentSettings ? instance.attachmentSettings.get() : false;
+    if (instance && instance.attachmentSettings) {
+      return instance.attachmentSettings.get();
+    }
+    return false;
   },
   cronSettings() {
     const instance = Template.instance();
-    return instance && instance.cronSettings ? instance.cronSettings.get() : false;
+    if (instance && instance.cronSettings) {
+      return instance.cronSettings.get();
+    }
+    return false;
   },
   loading() {
     const instance = Template.instance();
-    return instance && instance.loading ? instance.loading.get() : false;
+    if (instance && instance.loading) {
+      return instance.loading.get();
+    }
+    return false;
   }
 });