diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index 0f4d1399b..8f21e71f1 100644
--- a/lib/icinga/checkable.cpp
+++ b/lib/icinga/checkable.cpp
@@ -63,6 +63,14 @@ void Checkable::Start(bool runtimeCreated)
 {
 	double now = Utility::GetTime();
 
+	{
+		auto cr (GetLastCheckResult());
+
+		if (GetLastCheckStarted() > (cr ? cr->GetExecutionEnd() : 0.0)) {
+			SetNextCheck(GetLastCheckStarted());
+		}
+	}
+
 	if (GetNextCheck() < now + 60) {
 		double delta = std::min(GetCheckInterval(), 60.0);
 		delta *= (double)std::rand() / RAND_MAX;