diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index 0ab090284..36a5a6c79 100644
--- a/lib/icinga/checkable.cpp
+++ b/lib/icinga/checkable.cpp
@@ -160,7 +160,9 @@ int Checkable::GetSeverity() const
 
 bool Checkable::GetProblem() const
 {
-	return !IsStateOK(GetStateRaw());
+	auto cr (GetLastCheckResult());
+
+	return cr && !IsStateOK(cr->GetState());
 }
 
 bool Checkable::GetHandled() const