diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index 5b2964a84..23c06e480 100644
--- a/lib/icinga/notification.cpp
+++ b/lib/icinga/notification.cpp
@@ -365,7 +365,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
 			 */
 			{
 				ObjectLock olock(this);
-				if (type == NotificationRecovery && GetInterval() <= 0)
+				if (GetInterval() <= 0 && IsRecoveryOrFlappingEndAndCheckableIsOK(checkable, cr, type))
 					SetNoMoreNotifications(false);
 			}