diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php
index f9c1673a15..1b57c53780 100644
--- a/pandora_console/godmode/alerts/configure_alert_action.php
+++ b/pandora_console/godmode/alerts/configure_alert_action.php
@@ -283,12 +283,12 @@ for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
     // Store the value in a hidden to keep it on first execution
     $table->data['field'.$i][1] .= html_print_input_hidden(
         'field'.$i.'_value',
-        !empty($action['field'.$i]) ? $action['field'.$i] : '',
+        (!empty($action['field'.$i]) || $action['field'.$i] == 0) ? $action['field'.$i] : '',
         true
     );
     $table->data['field'.$i][2] .= html_print_input_hidden(
         'field'.$i.'_recovery_value',
-        !empty($action['field'.$i.'_recovery']) ? $action['field'.$i.'_recovery'] : '',
+        (!empty($action['field'.$i.'_recovery']) || $action['field'.$i] == 0) ? $action['field'.$i.'_recovery'] : '',
         true
     );
 }