diff --git a/lib/icinga/apiactions.cpp b/lib/icinga/apiactions.cpp
index 6df22d82b..f94289af5 100644
--- a/lib/icinga/apiactions.cpp
+++ b/lib/icinga/apiactions.cpp
@@ -568,7 +568,7 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object,
 
 	String endpoint = "$command_endpoint$";
 	if (params->Contains("endpoint"))
-		endpoint = params->Get("endpoint");
+		endpoint = HttpUtility::GetLastParameter(params, "endpoint");
 
 	MacroProcessor::ResolverList resolvers;
 	if (params->Contains("macros")) {