diff --git a/lib/icinga/checkable-event.cpp b/lib/icinga/checkable-event.cpp
index 91b2a443d..2983be846 100644
--- a/lib/icinga/checkable-event.cpp
+++ b/lib/icinga/checkable-event.cpp
@@ -49,7 +49,7 @@ void Checkable::ExecuteEventHandler(const Dictionary::Ptr& resolvedMacros, bool
 
 	ec->Execute(this, macros, useResolvedMacros);
 
-	if (endpoint) {
+	if (endpoint && !GetExtension("agent_check")) {
 		Dictionary::Ptr message = new Dictionary();
 		message->Set("jsonrpc", "2.0");
 		message->Set("method", "event::ExecuteCommand");