diff --git a/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java b/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
index 137c98ebd4bd54c295fd3ce70c7bbe2ddc7e3f85..26acd9f484440b259b863aaf6263c0cc6a80bc24 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
+++ b/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
@@ -664,6 +664,27 @@ public class BaseFullWebappController extends BasicController implements ChiefCo
 		myWindow.setDTabs(null);
 
 		getWindowControl().getWindowBackOffice().removeCycleListener(this);
+		
+		if (jsServerC != null) {
+			jsServerC.dispose();
+			jsServerC = null;
+		}
+		if (debugC != null) {
+			debugC.dispose();
+			debugC = null;
+		}
+		if (inlineTranslationC != null) {
+			inlineTranslationC.dispose();
+			inlineTranslationC = null;
+		}
+		if (developmentC != null) {
+			developmentC.dispose();
+			developmentC = null;
+		}
+		if (jsLoggerC != null) {
+			jsLoggerC.dispose();
+			jsLoggerC = null;
+		}
 	}
 
 	private void setGuiStack(GuiStack guiStack) {