diff --git a/ee/src/main/java/org/jboss/as/ee/naming/ModuleContextProcessor.java b/ee/src/main/java/org/jboss/as/ee/naming/ModuleContextProcessor.java
index 8042bf6f9b5c..ab017bd49f72 100644
--- a/ee/src/main/java/org/jboss/as/ee/naming/ModuleContextProcessor.java
+++ b/ee/src/main/java/org/jboss/as/ee/naming/ModuleContextProcessor.java
@@ -79,7 +79,7 @@ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitPro
                 .addInjection(moduleNameBinder.getManagedObjectInjector(), new ValueManagedReferenceFactory(Values.immediateValue(moduleDescription.getModuleName())))
                 .addDependency(moduleContextServiceName, ServiceBasedNamingStore.class, moduleNameBinder.getNamingStoreInjector())
                 .install();
-        deploymentUnit.addToAttachmentList(org.jboss.as.server.deployment.Attachments.JNDI_DEPENDENCIES,moduleNameServiceName);
+        deploymentUnit.addToAttachmentList(org.jboss.as.server.deployment.Attachments.JNDI_DEPENDENCIES, moduleNameServiceName);
 
         deploymentUnit.putAttachment(MODULE_CONTEXT_CONFIG, moduleContextServiceName);
 
@@ -106,7 +106,10 @@ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitPro
         deploymentUnit.putAttachment(Attachments.JAVA_NAMESPACE_SETUP_ACTION, setupAction);
     }
 
-    public void undeploy(DeploymentUnit context) {
-
+    public void undeploy(DeploymentUnit deploymentUnit) {
+        deploymentUnit.removeAttachment(Attachments.JAVA_NAMESPACE_SETUP_ACTION);
+        deploymentUnit.getAttachmentList(org.jboss.as.ee.component.Attachments.WEB_SETUP_ACTIONS).removeIf(setupAction -> setupAction instanceof JavaNamespaceSetup);
+        deploymentUnit.getAttachmentList(SETUP_ACTIONS).removeIf(setupAction -> setupAction instanceof JavaNamespaceSetup);
+        deploymentUnit.removeAttachment(MODULE_CONTEXT_CONFIG);
     }
 }