diff --git a/lib/icinga/service-check.cpp b/lib/icinga/service-check.cpp
index 45e98fc8a..796a2bc94 100644
--- a/lib/icinga/service-check.cpp
+++ b/lib/icinga/service-check.cpp
@@ -108,7 +108,7 @@ void Service::UpdateNextCheck(void)
 
 	double interval;
 
-	if (GetStateType() == StateTypeSoft)
+	if (GetStateType() == StateTypeSoft && GetLastCheckResult() != NULL)
 		interval = GetRetryInterval();
 	else
 		interval = GetCheckInterval();