diff --git a/lib/checker/checkercomponent.cpp b/lib/checker/checkercomponent.cpp
index 06ebb7bba..9368ba6a3 100644
--- a/lib/checker/checkercomponent.cpp
+++ b/lib/checker/checkercomponent.cpp
@@ -206,11 +206,6 @@ void CheckerComponent::CheckThreadProc()
 
 		lock.unlock();
 
-		if (forced) {
-			ObjectLock olock(checkable);
-			checkable->SetForceNextCheck(false);
-		}
-
 		Log(LogDebug, "CheckerComponent")
 			<< "Executing check for '" << checkable->GetName() << "'";
 
@@ -250,6 +245,13 @@ void CheckerComponent::ExecuteCheckHelper(const Checkable::Ptr& checkable)
 		Log(LogCritical, "checker", output);
 	}
 
+	{
+		ObjectLock oLock (checkable);
+		if (checkable->GetForceNextCheck()) {
+			checkable->SetForceNextCheck(false);
+		}
+	}
+
 	Checkable::DecreasePendingChecks();
 
 	{