diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index be880a3655..5dd28075da 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -2713,6 +2713,7 @@ function events_print_type_img(
             $icon = 'images/module_warning.png';
         break;
 
+        case 'unknown':
         case 'going_unknown':
             $icon = 'images/module_unknown.png';
         break;
@@ -2741,7 +2742,6 @@ function events_print_type_img(
             $icon = 'images/configuration@svg.svg';
         break;
 
-        case 'unknown':
         default:
             $style .= ' invert_filter';
             $icon = 'images/event.svg';
@@ -2993,6 +2993,9 @@ function events_print_type_description($type, $return=false)
         break;
 
         case 'unknown':
+            $output .= __('Unknown');
+        break; 
+
         default:
             $output .= __('Unknown type:').': '.$type;
         break;
@@ -5861,6 +5864,7 @@ function events_get_instructions($event, $max_text_length=300)
     }
 
     switch ($event['event_type']) {
+        case 'unknown':
         case 'going_unknown':
             if ($event['unknown_instructions'] != '') {
                 $value = str_replace(
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 5469c50f29..dec9a6b9f8 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -7916,7 +7916,7 @@ sub pandora_manage_main ($$$) {
 					'values' => [
 						'unknown','alert_fired','alert_recovered','alert_ceased',
 						'alert_manual_validation','recon_host_detected','system',
-						'error','new_agent','going_up_warning','going_up_critical','going_down_warning',
+						'error','new_agent','going_up_warning','going_up_critical','going_down_warning','going_unknown',
 						'going_down_normal','going_down_critical','going_up_normal','configuration_change'
 					]
 				},