diff --git a/src/components/HotlistList/HotlistList.tsx b/src/components/HotlistList/HotlistList.tsx
index 7833160..2d8f565 100644
--- a/src/components/HotlistList/HotlistList.tsx
+++ b/src/components/HotlistList/HotlistList.tsx
@@ -21,7 +21,7 @@ const HotlistList = () => {
   return (
     <Card className="p-4">
       <CardHeader title="Uploaded hotlists" />
-      {hotlists.length > 0 ? (
+      {hotlists?.length > 0 ? (
         <ul className="px-2">
           {hotlists?.map((hotlist) => (
             <li
diff --git a/src/components/SettingForms/WiFi&Modem/ModemSettings.tsx b/src/components/SettingForms/WiFi&Modem/ModemSettings.tsx
index 723b392..2d15cec 100644
--- a/src/components/SettingForms/WiFi&Modem/ModemSettings.tsx
+++ b/src/components/SettingForms/WiFi&Modem/ModemSettings.tsx
@@ -37,41 +37,32 @@ const ModemSettings = () => {
   const handleSubmit = async (values: ModemSettingsType) => {
     const invalidPrimary = ValidateIPaddress(values.serverPrimary);
     const invalidSecondary = ValidateIPaddress(values.serverSecondary);
+
     if (invalidPrimary || invalidSecondary) {
       toast.error(invalidPrimary || invalidSecondary, {
         id: "invalid-ip",
       });
       return;
     }
+
+    const fields = [
+      { property: "propAPN", value: values.apn },
+      { property: "propPassword", value: values.password },
+      { property: "propUsername", value: values.username },
+      { property: "propMode", value: showSettings ? "AUTO" : "MANUAL" },
+      { property: "propNameServerPrimary", value: values.serverPrimary },
+    ];
+
+    if (values.serverSecondary?.trim()) {
+      fields.push({
+        property: "propNameServerSecondary",
+        value: values.serverSecondary.trim(),
+      });
+    }
+
     const modemConfig = {
       id: "ModemAndWifiManager-modem",
-      fields: [
-        {
-          property: "propAPN",
-          value: values.apn,
-        },
-        {
-          property: "propPassword",
-          value: values.password,
-        },
-        {
-          property: "propUsername",
-          value: values.username,
-        },
-
-        {
-          property: "propMode",
-          value: showSettings ? "AUTO" : "MANUAL",
-        },
-        {
-          property: "propNameServerPrimary",
-          value: values.serverPrimary,
-        },
-        {
-          property: "propNameServerSecondary",
-          value: values.serverSecondary,
-        },
-      ],
+      fields,
     };
 
     const response = await modemMutation.mutateAsync(modemConfig);