diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index f1419da6db..16c0ecb0ba 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -573,7 +573,7 @@ sub pandora_evaluate_alert ($$$$$$$;$$$$) {
 			if ($timeBlock->{'start'} eq $timeBlock->{'end'}) {
 				# All day.
 				$inSlot = 1;
-			} elsif ($timeBlock->{'start'} le $time && $timeBlock->{'end'} ge $time) {
+			} elsif ($timeBlock->{'start'} le $time && (($timeBlock->{'end'} eq '00:00:00') || ($timeBlock->{'end'} ge $time))) {
 				# In range.
 				$inSlot = 1;
 			}