diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp
index e3a0f10bf..14f6ca129 100644
--- a/src/src/ESPEasyCore/Controller.cpp
+++ b/src/src/ESPEasyCore/Controller.cpp
@@ -60,8 +60,8 @@ void sendData(struct EventStruct *event, bool sendEvents)
         Settings.TaskDeviceSendData[x][event->TaskIndex] &&        
         Settings.Protocol[x])
     {
-      const protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(event->ControllerIndex);
       event->ControllerIndex = x;
+      const protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(event->ControllerIndex);
       event->idx             = Settings.TaskDeviceID[x][event->TaskIndex];
 
       if (validUserVar(event)) {