diff --git a/core/modules/workspaces/src/WorkspaceAssociation.php b/core/modules/workspaces/src/WorkspaceAssociation.php
index 02d6924c4e4bbc8993cdfbea29e0688bff7edfeb..8a93a83e34c5380f44ee5faa96d1994dacfb7bcf 100644
--- a/core/modules/workspaces/src/WorkspaceAssociation.php
+++ b/core/modules/workspaces/src/WorkspaceAssociation.php
@@ -391,7 +391,12 @@ public static function getSubscribedEvents(): array {
    *   The workspace publish event.
    */
   public function onPostPublish(WorkspacePublishEvent $event): void {
-    $this->deleteAssociations($event->getWorkspace()->id());
+    // Cleanup associations for the published workspace as well as its
+    // descendants.
+    $affected_workspaces = $this->workspaceRepository->getDescendantsAndSelf($event->getWorkspace()->id());
+    foreach ($affected_workspaces as $workspace_id) {
+      $this->deleteAssociations($workspace_id);
+    }
   }
 
 }
diff --git a/core/modules/workspaces/tests/src/Kernel/WorkspaceAssociationTest.php b/core/modules/workspaces/tests/src/Kernel/WorkspaceAssociationTest.php
index 4d7e8d80e62862232a1f4e9e5fe101ed6fa17bf0..c641c5dcd570f11a9b015e31de842216abe54663 100644
--- a/core/modules/workspaces/tests/src/Kernel/WorkspaceAssociationTest.php
+++ b/core/modules/workspaces/tests/src/Kernel/WorkspaceAssociationTest.php
@@ -156,6 +156,14 @@ public function testWorkspaceAssociation(): void {
     $expected_initial_revisions['dev'] = [8];
 
     $this->assertWorkspaceAssociations('node', $expected_latest_revisions, $expected_all_revisions, $expected_initial_revisions);
+
+    // Publish 'stage' and check the workspace associations.
+    /** @var \Drupal\workspaces\WorkspacePublisherInterface $workspace_publisher */
+    $workspace_publisher = \Drupal::service('workspaces.operation_factory')->getPublisher($this->workspaces['stage']);
+    $workspace_publisher->publish();
+
+    $expected_revisions['stage'] = $expected_revisions['dev'] = [];
+    $this->assertWorkspaceAssociations('node', $expected_revisions, $expected_revisions, $expected_revisions);
   }
 
   /**