diff --git a/client/src/pages/Alerts.jsx b/client/src/pages/Alerts.jsx
index 7bb191c..4e28561 100644
--- a/client/src/pages/Alerts.jsx
+++ b/client/src/pages/Alerts.jsx
@@ -502,8 +502,8 @@ const CreateAlertRuleModal = ({ onClose, onSave }) => {
       if (!payload.description || payload.description.trim() === '') delete payload.description;
       if (!payload.min_rssi) delete payload.min_rssi;
       if (!payload.max_rssi) delete payload.max_rssi;
-      if (!payload.device_ids || payload.device_ids.length === 0) payload.device_ids = null;
-      if (!payload.drone_types || payload.drone_types.length === 0) payload.drone_types = null;
+      if (!payload.device_ids || payload.device_ids.length === 0) delete payload.device_ids;
+      if (!payload.drone_types || payload.drone_types.length === 0) delete payload.drone_types;
       
       // Only include webhook_url if webhook channel is selected
       if (!payload.alert_channels || !payload.alert_channels.includes('webhook')) {