diff --git a/apps/client/src/components/admin/manage/cad-settings/CADFeaturesTab.tsx b/apps/client/src/components/admin/manage/cad-settings/CADFeaturesTab.tsx
index ba8c02277..149808b94 100644
--- a/apps/client/src/components/admin/manage/cad-settings/CADFeaturesTab.tsx
+++ b/apps/client/src/components/admin/manage/cad-settings/CADFeaturesTab.tsx
@@ -72,13 +72,13 @@ export function CADFeaturesTab() {
   function createInitialOptions() {
     const obj = {} as Partial<Record<Feature, any>>;
 
-    const cadFeatures = cad?.features?.options;
-
-    for (const key in cadFeatures) {
-      let option = cadFeatures[key as keyof typeof cadFeatures];
+    const cadFeatures = cad?.features;
+    for (const _key in cadFeatures) {
+      const key = _key as Feature;
+      let option = cadFeatures.options?.[key];
 
       if (key === Feature.LICENSE_EXAMS) {
-        if (option.length === 0) {
+        if (!option || option.length === 0) {
           option = Object.values(LicenseExamType);
         }
       }
diff --git a/apps/client/src/hooks/useFeatureEnabled.ts b/apps/client/src/hooks/useFeatureEnabled.ts
index f68b73c04..75f843511 100644
--- a/apps/client/src/hooks/useFeatureEnabled.ts
+++ b/apps/client/src/hooks/useFeatureEnabled.ts
@@ -34,13 +34,13 @@ export function useFeatureEnabled(
   const options = React.useMemo(() => {
     const obj = {} as Partial<Record<Feature, any>>;
 
-    const cadFeatures = _features?.options;
+    const cadFeatures = _features;
+    for (const _key in cadFeatures) {
+      const key = _key as Feature;
+      let option = cadFeatures.options?.[key];
 
-    for (const key in cadFeatures) {
-      let option = cadFeatures[key as keyof typeof cadFeatures];
-
-      if (key === Feature.LICENSE_EXAMS && Array.isArray(option)) {
-        if (option.length === 0) {
+      if (key === Feature.LICENSE_EXAMS) {
+        if (!option || option.length === 0) {
           option = Object.values(LicenseExamType);
         }
       }