diff --git a/src/common/optionsUtils.js b/src/common/optionsUtils.js
index 8b4579d..652f9e8 100644
--- a/src/common/optionsUtils.js
+++ b/src/common/optionsUtils.js
@@ -91,7 +91,7 @@
 
              // Handle applicable kill switches which force disable features
              if (items?._forceDisabledFeatures) {
-               for (let feature of items?._forceDisabledFeatures) {
+               for (let feature of items._forceDisabledFeatures) {
                  items[feature] = false;
                }
 
@@ -172,7 +172,7 @@
 // |requireOptionalPermissions| will determine whether to check if the required
 // optional permissions have been granted or not.
 export function isOptionEnabled(option, requireOptionalPermissions = true) {
-  return getOptions(option).then(options => {
+  return getOptions(option, requireOptionalPermissions).then(options => {
     return options?.[option] === true;
   });
 }