diff --git a/src/main/java/org/gridsuite/study/server/service/NetworkModificationTreeService.java b/src/main/java/org/gridsuite/study/server/service/NetworkModificationTreeService.java
index 5dbca89de..bf70aa1d1 100644
--- a/src/main/java/org/gridsuite/study/server/service/NetworkModificationTreeService.java
+++ b/src/main/java/org/gridsuite/study/server/service/NetworkModificationTreeService.java
@@ -1383,10 +1383,6 @@ public void invalidateNodeTree(UUID studyUuid, UUID nodeUuid, UUID rootNetworkUu
         invalidateNodeInfos.setNetworkUuid(rootNetworkService.getNetworkUuid(rootNetworkUuid));
         deleteInvalidationInfos(invalidateNodeInfos, skipDeleteVariants);
 
-        if (!isRootNode(nodeUuid)) {
-            emitAllComputationStatusChanged(studyUuid, nodeUuid, rootNetworkUuid, invalidateTreeParameters.computationsInvalidationMode());
-        }
-
         if (startTime.get() != null) {
             LOGGER.trace("unbuild node '{}' of study '{}' : {} seconds", nodeUuid, studyUuid,
                 TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - startTime.get()));
@@ -1402,7 +1398,6 @@ public void invalidateNode(UUID studyUuid, UUID nodeUuid, UUID rootNetworkUuid)
         invalidateNodeInfos.setNetworkUuid(rootNetworkService.getNetworkUuid(rootNetworkUuid));
 
         deleteInvalidationInfos(invalidateNodeInfos);
-        emitAllComputationStatusChanged(studyUuid, nodeUuid, rootNetworkUuid, InvalidateNodeTreeParameters.ComputationsInvalidationMode.ALL);
 
         if (startTime.get() != null) {
             LOGGER.trace("unbuild node '{}' of study '{}' : {} seconds", nodeUuid, studyUuid,
diff --git a/src/test/java/org/gridsuite/study/server/NetworkModificationUnitTest.java b/src/test/java/org/gridsuite/study/server/NetworkModificationUnitTest.java
index 37d27c6a9..687a1baf8 100644
--- a/src/test/java/org/gridsuite/study/server/NetworkModificationUnitTest.java
+++ b/src/test/java/org/gridsuite/study/server/NetworkModificationUnitTest.java
@@ -180,7 +180,6 @@ void unbuildNode() {
         assertNodeBuildStatus(node3Uuid, BuildStatus.NOT_BUILT);
         assertNodeBuildStatus(node4Uuid, BuildStatus.BUILT);
         checkUpdateBuildStateMessageReceived(studyUuid, List.of(node1Uuid));
-        checkUpdateStatusMessagesReceived(studyUuid, node1Uuid, output);
         checkElementUpdatedMessageSent(studyUuid, USER_ID_HEADER);
         Mockito.verify(networkService).deleteVariants(NETWORK_UUID, List.of(VARIANT_1));
 
diff --git a/src/test/java/org/gridsuite/study/server/studycontroller/NodeControllerTest.java b/src/test/java/org/gridsuite/study/server/studycontroller/NodeControllerTest.java
index b930f96a4..099bb7360 100644
--- a/src/test/java/org/gridsuite/study/server/studycontroller/NodeControllerTest.java
+++ b/src/test/java/org/gridsuite/study/server/studycontroller/NodeControllerTest.java
@@ -270,7 +270,7 @@ void testCutAndPasteNodeWithoutModification() throws Exception {
         UUID stubDeleteReportsId = wireMockServer.stubFor(WireMock.delete(WireMock.urlPathEqualTo("/v1/reports"))
             .willReturn(WireMock.ok())).getId();
 
-        cutAndPasteNode(study1Uuid, emptyNode, node1.getId(), InsertMode.BEFORE, 1, userId);
+        cutAndPasteNode(study1Uuid, emptyNode, node1.getId(), InsertMode.BEFORE, 1, userId, false);
 
         wireMockStubs.verifyDeleteReports(stubDeleteReportsId, 1);
 
@@ -413,8 +413,13 @@ void testCutAndPasteSubtree() throws Exception {
             .header(USER_ID_HEADER, "userId")).andExpect(status().isNotFound());
     }
 
-    @SuppressWarnings("checkstyle:LambdaBodyLength")
     private void cutAndPasteNode(UUID studyUuid, NetworkModificationNode nodeToCopy, UUID referenceNodeUuid, InsertMode insertMode, int childCount, String userId) throws Exception {
+        cutAndPasteNode(studyUuid, nodeToCopy, referenceNodeUuid, insertMode, childCount, userId, true);
+    }
+
+    @SuppressWarnings("checkstyle:LambdaBodyLength")
+    private void cutAndPasteNode(UUID studyUuid, NetworkModificationNode nodeToCopy, UUID referenceNodeUuid,
+                                 InsertMode insertMode, int childCount, String userId, boolean checkComputationStatus) throws Exception {
         UUID stubUuid = wireMockStubs.stubNetworkModificationCountGet(nodeToCopy.getModificationGroupUuid().toString(),
             EMPTY_MODIFICATION_GROUP_UUID.equals(nodeToCopy.getModificationGroupUuid()) ? 0 : 1);
         boolean wasBuilt = rootNetworkNodeInfoService.getRootNetworkNodeInfo(nodeToCopy.getId(), studyTestUtils.getOneRootNetworkUuid(studyUuid)).get().getNodeBuildStatus().toDto().isBuilt();
@@ -449,7 +454,9 @@ private void cutAndPasteNode(UUID studyUuid, NetworkModificationNode nodeToCopy,
         if (wasBuilt) {
             assertNotNull(TestUtils.receiveStudyUpdate(output, studyUpdateDestination));
         }
-        checkComputationStatusMessageReceived();
+        if (checkComputationStatus) {
+            checkComputationStatusMessageReceived();
+        }
 
         if (!nodeHasModifications) {
             return;