diff --git a/Containers/UserSettings/AppriseAlertSettings/AppriseAlertSettings.tsx b/Containers/UserSettings/AppriseAlertSettings/AppriseAlertSettings.tsx
index 278cb16..0d7e13a 100644
--- a/Containers/UserSettings/AppriseAlertSettings/AppriseAlertSettings.tsx
+++ b/Containers/UserSettings/AppriseAlertSettings/AppriseAlertSettings.tsx
@@ -52,8 +52,8 @@ export default function AppriseAlertSettings() {
           },
         });
 
-        const data: AppriseAlertDataForm = await response.json();
-        setIsAlertEnabled(data.appriseAlert);
+        const data: Optional<AppriseAlertDataForm> = await response.json();
+        setIsAlertEnabled(data?.appriseAlert ?? false);
         setIsSwitchDisabled(false);
       } catch (error) {
         setIsSwitchDisabled(true);
diff --git a/Containers/UserSettings/AppriseAlertSettings/AppriseMode/AppriseMode.tsx b/Containers/UserSettings/AppriseAlertSettings/AppriseMode/AppriseMode.tsx
index fd8a944..2f282e9 100644
--- a/Containers/UserSettings/AppriseAlertSettings/AppriseMode/AppriseMode.tsx
+++ b/Containers/UserSettings/AppriseAlertSettings/AppriseMode/AppriseMode.tsx
@@ -30,7 +30,9 @@ export default function AppriseMode() {
 
   ////State
   const [displayStatelessURL, setDisplayStatelessURL] = useState<boolean>(false);
-  const [appriseMode, setAppriseMode] = useState<AppriseModeEnum>(AppriseModeEnum.STATELESS);
+  const [appriseMode, setAppriseMode] = useState<Optional<AppriseModeEnum>>(
+    AppriseModeEnum.STATELESS
+  );
   const [appriseStatelessURL, setAppriseStatelessURL] = useState<Optional<string>>();
 
   ////LifeCycle
diff --git a/Containers/UserSettings/AppriseAlertSettings/AppriseURLs/AppriseURLs.tsx b/Containers/UserSettings/AppriseAlertSettings/AppriseURLs/AppriseURLs.tsx
index 429ba55..e5568fb 100644
--- a/Containers/UserSettings/AppriseAlertSettings/AppriseURLs/AppriseURLs.tsx
+++ b/Containers/UserSettings/AppriseAlertSettings/AppriseURLs/AppriseURLs.tsx
@@ -44,7 +44,7 @@ export default function AppriseURLs() {
         });
 
         const data: AppriseServicesResponse = await response.json();
-        const servicesText = data.appriseServices.join('\n');
+        const servicesText = data.appriseServices?.join('\n');
         setAppriseServicesList(servicesText);
         setFetchError(false);
       } catch (error) {
diff --git a/Containers/UserSettings/EmailAlertSettings/EmailAlertSettings.tsx b/Containers/UserSettings/EmailAlertSettings/EmailAlertSettings.tsx
index a70238e..3a50ea5 100644
--- a/Containers/UserSettings/EmailAlertSettings/EmailAlertSettings.tsx
+++ b/Containers/UserSettings/EmailAlertSettings/EmailAlertSettings.tsx
@@ -53,8 +53,8 @@ export default function EmailAlertSettings() {
           },
         });
 
-        const data: EmailAlertDataForm = await response.json();
-        setIsAlertEnabled(data.emailAlert);
+        const data: Optional<EmailAlertDataForm> = await response.json();
+        setIsAlertEnabled(data?.emailAlert ?? false);
         setIsSwitchDisabled(false);
       } catch (error) {
         setIsSwitchDisabled(true);
diff --git a/types/api/apprise.types.ts b/types/api/apprise.types.ts
index c292cbf..bfdd572 100644
--- a/types/api/apprise.types.ts
+++ b/types/api/apprise.types.ts
@@ -1,10 +1,10 @@
 import { AppriseModeEnum } from '../domain/config.types';
 
 export type AppriseModeResponse = {
-  appriseMode: AppriseModeEnum;
-  appriseStatelessURL: string;
+  appriseMode?: AppriseModeEnum;
+  appriseStatelessURL?: string;
 };
 
 export type AppriseServicesResponse = {
-  appriseServices: string[];
+  appriseServices?: string[];
 };
diff --git a/types/domain/config.types.ts b/types/domain/config.types.ts
index fe6b735..6ccec76 100644
--- a/types/domain/config.types.ts
+++ b/types/domain/config.types.ts
@@ -4,15 +4,15 @@ export type Repository = {
   repositoryName: string;
   status: boolean;
   lastSave: number;
-  alert: number;
+  alert?: number;
   storageSize: number;
   storageUsed: number;
   sshPublicKey: string;
   comment: string;
   displayDetails: boolean;
   unixUser: string;
-  lanCommand: boolean;
-  appendOnlyMode: boolean;
+  lanCommand?: boolean;
+  appendOnlyMode?: boolean;
 };
 
 export type BorgWarehouseUser = {