diff --git a/client/src/components/AlertModals.jsx b/client/src/components/AlertModals.jsx
index 7d1cfd4..4f77e92 100644
--- a/client/src/components/AlertModals.jsx
+++ b/client/src/components/AlertModals.jsx
@@ -41,6 +41,16 @@ export const EditAlertModal = ({ rule, onClose, onSuccess }) => {
 
   useEffect(() => {
     if (rule) {
+      // Normalize alert_channels - ensure it's always an array
+      let alertChannels = rule.alert_channels || ['sms'];
+      if (typeof alertChannels === 'object' && !Array.isArray(alertChannels)) {
+        // Convert object like {sms: true, webhook: false, email: true} to array
+        alertChannels = Object.keys(alertChannels).filter(key => alertChannels[key]);
+      }
+      if (!Array.isArray(alertChannels)) {
+        alertChannels = ['sms']; // fallback to default
+      }
+
       setFormData({
         name: rule.name || '',
         description: rule.description || '',
@@ -48,7 +58,7 @@ export const EditAlertModal = ({ rule, onClose, onSuccess }) => {
         min_detections: rule.min_detections || 1,
         time_window: rule.time_window || 300,
         cooldown_period: rule.cooldown_period || 600,
-        alert_channels: rule.alert_channels || ['sms'],
+        alert_channels: alertChannels,
         min_threat_level: rule.min_threat_level || '',
         drone_types: rule.drone_types || [],
         device_ids: rule.device_ids || [],
@@ -67,12 +77,17 @@ export const EditAlertModal = ({ rule, onClose, onSuccess }) => {
   };
 
   const handleChannelChange = (channel, checked) => {
-    setFormData(prev => ({
-      ...prev,
-      alert_channels: checked 
-        ? [...prev.alert_channels, channel]
-        : prev.alert_channels.filter(c => c !== channel)
-    }));
+    setFormData(prev => {
+      // Ensure alert_channels is always an array
+      const currentChannels = Array.isArray(prev.alert_channels) ? prev.alert_channels : [];
+      
+      return {
+        ...prev,
+        alert_channels: checked 
+          ? [...currentChannels, channel]
+          : currentChannels.filter(c => c !== channel)
+      };
+    });
   };
 
   const handleDroneTypeChange = (droneType, checked) => {
@@ -269,7 +284,7 @@ export const EditAlertModal = ({ rule, onClose, onSuccess }) => {
                 <label key={channel} className="flex items-center">
                   <input
                     type="checkbox"
-                    checked={formData.alert_channels.includes(channel)}
+                    checked={Array.isArray(formData.alert_channels) && formData.alert_channels.includes(channel)}
                     onChange={(e) => handleChannelChange(channel, e.target.checked)}
                     className="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 rounded"
                   />
@@ -281,7 +296,7 @@ export const EditAlertModal = ({ rule, onClose, onSuccess }) => {
             </div>
           </div>
 
-          {formData.alert_channels.includes('sms') && (
+          {Array.isArray(formData.alert_channels) && formData.alert_channels.includes('sms') && (
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 SMS Phone Number
@@ -297,7 +312,7 @@ export const EditAlertModal = ({ rule, onClose, onSuccess }) => {
             </div>
           )}
 
-          {formData.alert_channels.includes('webhook') && (
+          {Array.isArray(formData.alert_channels) && formData.alert_channels.includes('webhook') && (
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Webhook URL
diff --git a/client/src/pages/Alerts.jsx b/client/src/pages/Alerts.jsx
index 8573e70..ab09854 100644
--- a/client/src/pages/Alerts.jsx
+++ b/client/src/pages/Alerts.jsx
@@ -366,14 +366,25 @@ const Alerts = () => {
                       </td>
                       <td>
                         <div className="flex space-x-1">
-                          {(rule.alert_channels || []).map((channel, index) => (
-                            <span
-                              key={index}
-                              className="px-2 py-1 bg-blue-100 text-blue-800 rounded text-xs"
-                            >
-                              {channel}
-                            </span>
-                          ))}
+                          {(() => {
+                            // Normalize alert_channels - ensure it's always an array
+                            let alertChannels = rule.alert_channels || [];
+                            if (typeof alertChannels === 'object' && !Array.isArray(alertChannels)) {
+                              // Convert object like {sms: true, webhook: false, email: true} to array
+                              alertChannels = Object.keys(alertChannels).filter(key => alertChannels[key]);
+                            }
+                            if (!Array.isArray(alertChannels)) {
+                              alertChannels = []; // fallback to empty array
+                            }
+                            return alertChannels.map((channel, index) => (
+                              <span
+                                key={index}
+                                className="px-2 py-1 bg-blue-100 text-blue-800 rounded text-xs"
+                              >
+                                {channel}
+                              </span>
+                            ));
+                          })()}
                         </div>
                       </td>
                       <td>
@@ -860,12 +871,17 @@ const CreateAlertRuleModal = ({ onClose, onSave }) => {
   };
 
   const handleChannelChange = (channel, checked) => {
-    setFormData(prev => ({
-      ...prev,
-      alert_channels: checked
-        ? [...prev.alert_channels, channel]
-        : prev.alert_channels.filter(c => c !== channel)
-    }));
+    setFormData(prev => {
+      // Ensure alert_channels is always an array
+      const currentChannels = Array.isArray(prev.alert_channels) ? prev.alert_channels : [];
+      
+      return {
+        ...prev,
+        alert_channels: checked
+          ? [...currentChannels, channel]
+          : currentChannels.filter(c => c !== channel)
+      };
+    });
   };
 
   const handleDroneTypeChange = (droneType, checked) => {
@@ -1000,7 +1016,7 @@ const CreateAlertRuleModal = ({ onClose, onSave }) => {
                       <label key={channel} className="flex items-center">
                         <input
                           type="checkbox"
-                          checked={formData.alert_channels.includes(channel)}
+                          checked={Array.isArray(formData.alert_channels) && formData.alert_channels.includes(channel)}
                           onChange={(e) => handleChannelChange(channel, e.target.checked)}
                           className="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 rounded"
                         />
@@ -1074,7 +1090,7 @@ const CreateAlertRuleModal = ({ onClose, onSave }) => {
                 </div>
 
                 {/* Conditional channel-specific fields */}
-                {formData.alert_channels.includes('sms') && (
+                {Array.isArray(formData.alert_channels) && formData.alert_channels.includes('sms') && (
                   <div>
                     <label className="block text-sm font-medium text-gray-700 mb-1">
                       SMS Phone Number
@@ -1093,7 +1109,7 @@ const CreateAlertRuleModal = ({ onClose, onSave }) => {
                   </div>
                 )}
 
-                {formData.alert_channels.includes('webhook') && (
+                {Array.isArray(formData.alert_channels) && formData.alert_channels.includes('webhook') && (
                   <div>
                     <label className="block text-sm font-medium text-gray-700 mb-1">
                       Webhook URL *
@@ -1102,7 +1118,7 @@ const CreateAlertRuleModal = ({ onClose, onSave }) => {
                       type="url"
                       name="webhook_url"
                       placeholder="https://your-webhook-endpoint.com/alerts"
-                      required={formData.alert_channels.includes('webhook')}
+                      required={Array.isArray(formData.alert_channels) && formData.alert_channels.includes('webhook')}
                       className="w-full border border-gray-300 rounded-md px-3 py-2 focus:ring-primary-500 focus:border-primary-500"
                       value={formData.webhook_url || ''}
                       onChange={handleChange}