diff --git a/digiwf-connector/digiwf-connector-starter/src/main/java/de/muenchen/oss/digiwf/connector/core/application/usecase/ExecuteTaskUseCase.java b/digiwf-connector/digiwf-connector-starter/src/main/java/de/muenchen/oss/digiwf/connector/core/application/usecase/ExecuteTaskUseCase.java
index e54991b765..587490f4a8 100644
--- a/digiwf-connector/digiwf-connector-starter/src/main/java/de/muenchen/oss/digiwf/connector/core/application/usecase/ExecuteTaskUseCase.java
+++ b/digiwf-connector/digiwf-connector-starter/src/main/java/de/muenchen/oss/digiwf/connector/core/application/usecase/ExecuteTaskUseCase.java
@@ -22,11 +22,9 @@ public void executeTask(@Valid ExecuteTaskCommand command) {
         log.info("Execute task with command {}", command);
 
         if (StringUtils.isNotBlank(command.getMessageName())) {
-            emitEventOutPort.emitEvent(command.getDestination(), command.getType(), command.getInstanceId(), command.getData());
-
-        } else {
             emitEventOutPort.emitEvent(command.getMessageName(), command.getDestination(), command.getType(), command.getInstanceId(), command.getData());
-
+        } else {
+            emitEventOutPort.emitEvent(command.getDestination(), command.getType(), command.getInstanceId(), command.getData());
         }
     }
 }
diff --git a/digiwf-connector/digiwf-connector-starter/src/test/java/de/muenchen/oss/digiwf/connector/core/application/usecase/ExecuteTaskUseCaseTest.java b/digiwf-connector/digiwf-connector-starter/src/test/java/de/muenchen/oss/digiwf/connector/core/application/usecase/ExecuteTaskUseCaseTest.java
index b5e1b9ada4..a2b4d8aa6f 100644
--- a/digiwf-connector/digiwf-connector-starter/src/test/java/de/muenchen/oss/digiwf/connector/core/application/usecase/ExecuteTaskUseCaseTest.java
+++ b/digiwf-connector/digiwf-connector-starter/src/test/java/de/muenchen/oss/digiwf/connector/core/application/usecase/ExecuteTaskUseCaseTest.java
@@ -36,7 +36,7 @@ void executeTask_shouldCallEmitEventWithCorrectParametersWhenMessageNameIsNotBla
         useCase.executeTask(command);
 
         // Assert
-        verify(emitEventOutPort).emitEvent(command.getDestination(), command.getType(), command.getInstanceId(), command.getData());
+        verify(emitEventOutPort).emitEvent(command.getMessageName(), command.getDestination(), command.getType(), command.getInstanceId(), command.getData());
     }
 
     @Test
@@ -53,6 +53,6 @@ void executeTask_shouldCallEmitEventWithDifferentParametersWhenMessageNameIsBlan
         useCase.executeTask(command);
 
         // Assert
-        verify(emitEventOutPort).emitEvent(command.getMessageName(), command.getDestination(), command.getType(), command.getInstanceId(), command.getData());
+        verify(emitEventOutPort).emitEvent(command.getDestination(), command.getType(), command.getInstanceId(), command.getData());
     }
 }