diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index c5f3b605b..6a3cd178b 100644
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -326,7 +326,8 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
 		/* If there was a OK -> NOT-OK state change for actively scheduled checks,
 		 * update the next check time using the retry_interval.
 		 * Important: Add the cluster message origin. */
-		UpdateNextCheck(origin);
+		if (GetStateType() == StateTypeSoft)
+			UpdateNextCheck(origin);
 	} else {
 		/* Reschedule the next check for passive check results. The side effect of
 		 * this is that for as long as we receive passive results for a service we