diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index 8bf1fed74..76b2cc37e 100644
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -107,7 +107,7 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
 		m_CheckRunning = false;
 	}
 
-	if (!cr)
+	if (!cr || !IsActive())
 		return;
 
 	double now = Utility::GetTime();
@@ -428,8 +428,6 @@ void Checkable::ExecuteCheck()
 	double scheduled_start = GetNextCheck();
 	double before_check = Utility::GetTime();
 
-	UpdateNextCheck();
-
 	bool reachable = IsReachable();
 
 	{
diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index 69af2c581..fe52e37ef 100644
--- a/lib/icinga/checkable.cpp
+++ b/lib/icinga/checkable.cpp
@@ -73,8 +73,11 @@ void Checkable::Start(bool runtimeCreated)
 {
 	double now = Utility::GetTime();
 
-	if (GetNextCheck() < now + 300)
-		UpdateNextCheck();
+	if (GetNextCheck() < now + 60) {
+		double delta = std::min(GetCheckInterval(), 60.0);
+		delta *= (double)std::rand() / RAND_MAX;
+		SetNextCheck(now + delta);
+	}
 
 	ObjectImpl<Checkable>::Start(runtimeCreated);
 }