diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index 793180be1..896537105 100644
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -51,7 +51,7 @@ void Service::Start(void)
 	double now = Utility::GetTime();
 
 	if (GetNextCheck() < now + 300)
-		SetNextCheck(now + Utility::Random() % 300);
+		UpdateNextCheck();
 
 	DynamicObject::Start();
 }