diff --git a/pom.xml b/pom.xml
index 18d3852a..75c46f3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,8 @@
         <mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
         <sonar.organization>gridsuite</sonar.organization>
         <sonar.projectKey>org.gridsuite:security-analysis-server</sonar.projectKey>
+        <!-- FIXME: powsybl-ws-commons modules'version is overloaded in the dependencies section to be removed at next powsybl-ws-dependencies.version upgrade -->
+        <powsybl-ws-commons.version>1.25.0-SNAPSHOT</powsybl-ws-commons.version>
     </properties>
 
     <build>
@@ -146,6 +148,7 @@
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-ws-commons</artifactId>
+            <version>${powsybl-ws-commons.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
diff --git a/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java b/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java
index 464793cf..0de0938b 100644
--- a/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java
+++ b/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java
@@ -40,7 +40,10 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
@@ -129,7 +132,7 @@ protected CompletableFuture<SecurityAnalysisResult> getCompletableFuture(Securit
 
         SecurityAnalysisRunParameters runParameters = new SecurityAnalysisRunParameters()
                 .setSecurityAnalysisParameters(runContext.getParameters().securityAnalysisParameters())
-                .setComputationManager(executionService.getComputationManager())
+                .setComputationManager(runContext.getComputationManager())
                 .setFilter(LimitViolationFilter.load())
                 .setLimitReductions(limitReductions)
                 .setReportNode(runContext.getReportNode());
@@ -173,6 +176,8 @@ private LimitReduction createLimitReduction(IdentifiableCriterion voltageLevelCr
 
     @Override
     protected void preRun(SecurityAnalysisRunContext runContext) {
+        super.preRun(runContext);
+
         LOGGER.info("Run security analysis on contingency lists: {}", runContext.getContingencyListNames().stream().map(LogUtils::sanitizeParam).toList());
 
         List<ContingencyInfos> contingencies = observer.observe("contingencies.fetch", runContext,