diff --git a/lib/icinga/checkable-flapping.cpp b/lib/icinga/checkable-flapping.cpp
index d0c8f8ec0..69861ddd0 100644
--- a/lib/icinga/checkable-flapping.cpp
+++ b/lib/icinga/checkable-flapping.cpp
@@ -67,7 +67,7 @@ void Checkable::UpdateFlappingStatus(bool stateChange)
 	SetFlapping(flapping, true);
 
 	if (flapping != GetFlapping())
-		SetFlappingLastChange(Utility::GetTime());
+		SetFlappingLastChange(GetLastCheckResult()->GetExecutionEnd());
 }
 
 bool Checkable::IsFlapping() const