diff --git a/lib/icinga/checkable-flapping.cpp b/lib/icinga/checkable-flapping.cpp
index 91efb6284..3b49a6cdd 100644
--- a/lib/icinga/checkable-flapping.cpp
+++ b/lib/icinga/checkable-flapping.cpp
@@ -70,7 +70,9 @@ void Checkable::UpdateFlappingStatus(bool stateChange)
 
 		double ee = GetLastCheckResult()->GetExecutionEnd();
 
-		OnFlappingChange(this, ee);
+		if (GetEnableFlapping() && IcingaApplication::GetInstance()->GetEnableFlapping()) {
+			OnFlappingChange(this, ee);
+		}
 
 		SetFlappingLastChange(ee);
 	}