diff --git a/lib/icinga/clusterevents-check.cpp b/lib/icinga/clusterevents-check.cpp
index 0ca53030c..63b2478f9 100644
--- a/lib/icinga/clusterevents-check.cpp
+++ b/lib/icinga/clusterevents-check.cpp
@@ -88,9 +88,9 @@ static void SendEventExecuteCommand(const Dictionary::Ptr& params, long exitStat
 	executedParams->Set("start", start);
 	executedParams->Set("end", end);
 
-	if (origin->IsLocal()) {
-		ClusterEvents::ExecutedCommandAPIHandler(origin, executedParams);
-	} else {
+	ClusterEvents::ExecutedCommandAPIHandler(origin, executedParams);
+
+	if (!origin->IsLocal()) {
 		Dictionary::Ptr executedMessage = new Dictionary();
 		executedMessage->Set("jsonrpc", "2.0");
 		executedMessage->Set("method", "event::ExecutedCommand");