diff --git a/server/jsonrpcserver.cpp b/server/jsonrpcserver.cpp
index 618c12e9..8325bcfc 100644
--- a/server/jsonrpcserver.cpp
+++ b/server/jsonrpcserver.cpp
@@ -139,14 +139,17 @@ void JsonRPCServer::handleRulesMessage(int clientId, int commandId, const QStrin
 void JsonRPCServer::handleActionMessage(int clientId, int commandId, const QString &method, const QVariantMap &params)
 {
     if (method == "ExecuteAction") {
-        QUuid deviceId = QUuid(params.value("deviceId").toUuid());
-        QVariantList actionParams = params.value("params").toList();
+        QVariantMap actionMap = params.value("action").toMap();
+        QUuid deviceId = actionMap.value("deviceId").toUuid();
+        QVariantList actionParams = actionMap.value("params").toList();
 
         Action action(deviceId);
         action.setParams(actionParams);
 
         HiveCore::instance()->deviceManager()->executeAction(action);
 
+        sendResponse(clientId, commandId);
+
     }
 }