diff --git a/BimServer/src/org/bimserver/BimServer.java b/BimServer/src/org/bimserver/BimServer.java
index <HASH>..<HASH> 100644
--- a/BimServer/src/org/bimserver/BimServer.java
+++ b/BimServer/src/org/bimserver/BimServer.java
@@ -213,6 +213,7 @@ public class BimServer {
 	 *            Configuration of BIMserver
 	 */
 	public BimServer(BimServerConfig config) {
+		System.setProperty("org.eclipse.emf.common.util.ReferenceClearingQueue", "false");
 		this.config = config;
 		try {
 			if (config.getHomeDir() != null) {
Disabled starting the ReferenceClearingQueue (EMF Reference Cleaner). We
don't need it, and since there seems to be no way to stop it, it's the
only way.

The reason is that this causes memory leaks on application servers on
redeployment without (application server) restart, also it's not a clear
start for running multiple unit tests.

<URL>