diff --git a/client/src/pages/Alerts.jsx b/client/src/pages/Alerts.jsx
index 4044cc7..895c8d8 100644
--- a/client/src/pages/Alerts.jsx
+++ b/client/src/pages/Alerts.jsx
@@ -338,24 +338,41 @@ const Alerts = () => {
                               <div className="text-xs text-gray-500">{t('alerts.droneTypes')}:</div>
                               <div className="flex flex-wrap gap-1 mt-1">
                                 {rule.drone_types.map((typeId, index) => {
-                                  const droneTypeKeys = {
-                                    0: 'consumer',
-                                    1: 'orlan',
-                                    2: 'professional',
-                                    3: 'racing',
-                                    4: 'unknown'
+                                  // Use the same comprehensive drone type mapping as getDroneTypeInfo
+                                  const droneTypeMap = {
+                                    0: { name: 'Unknown', color: 'gray' },
+                                    1: { name: 'Generic', color: 'blue' },
+                                    2: { name: 'Orlan', color: 'red', warning: true },
+                                    3: { name: 'Zala', color: 'orange', warning: true },
+                                    4: { name: 'Forpost', color: 'purple', warning: true },
+                                    5: { name: 'Inokhodets', color: 'indigo', warning: true },
+                                    6: { name: 'Lancet', color: 'red', warning: true },
+                                    7: { name: 'Shahed', color: 'yellow', warning: true },
+                                    8: { name: 'Geran', color: 'amber', warning: true },
+                                    9: { name: 'Kub', color: 'green', warning: true },
+                                    10: { name: 'X-UAV', color: 'teal' },
+                                    11: { name: 'SuperCam', color: 'cyan' },
+                                    12: { name: 'Eleron', color: 'lime' },
+                                    13: { name: 'DJI', color: 'blue' },
+                                    14: { name: 'Autel', color: 'violet' },
+                                    15: { name: 'Parrot', color: 'emerald' },
+                                    16: { name: 'Skydio', color: 'sky' },
+                                    17: { name: 'CryptoOrlan', color: 'red', warning: true }
                                   };
+                                  
+                                  const droneInfo = droneTypeMap[typeId] || droneTypeMap[0];
+                                  
                                   return (
                                     <span
                                       key={index}
                                       className={`px-1.5 py-0.5 rounded text-xs font-medium ${
-                                        typeId === 1 
+                                        droneInfo.warning
                                           ? 'bg-red-100 text-red-800' 
                                           : 'bg-gray-100 text-gray-800'
                                       }`}
                                     >
-                                      {t(`alerts.${droneTypeKeys[typeId] || 'unknown'}`)}
-                                      {typeId === 1 && '⚠️'}
+                                      {droneInfo.name}
+                                      {droneInfo.warning && '⚠️'}
                                     </span>
                                   );
                                 })}