diff --git a/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java b/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java
index cb13ec2777041ec21bb29c52c4a2cbeaff4e66af..2661f94e93fe1704dee146d18cdb12050c9c9867 100644
--- a/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java
+++ b/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java
@@ -264,6 +264,9 @@ public class ModelExtractionService extends AgentController implements Service<M
 			synchronized (skeleton) {
 				// Remove all obsolete deployment contexts
 				skeleton.getContainers().remove(wildFlyContainer);
+				for (DeploymentContext ctx : skeleton.getDeployment().getDeploymentContexts()) {
+					undeployedAssemblyContexts.add(ctx.getAssemblyContext());
+				}
 				skeleton.getDeployment().getDeploymentContexts().clear();
 				apply(skeleton);
 				wildFlyContainer = null;