diff --git a/org.adempiere.base/src/org/adempiere/base/event/EventManager.java b/org.adempiere.base/src/org/adempiere/base/event/EventManager.java
index acdbc79d31..25d6e98c29 100644
--- a/org.adempiere.base/src/org/adempiere/base/event/EventManager.java
+++ b/org.adempiere.base/src/org/adempiere/base/event/EventManager.java
@@ -72,7 +72,7 @@ public class EventManager implements IEventManager {
 	 */
 	public static IEventManager getInstance() {
 		synchronized (mutex) {
-			if (instance == null) {
+			while (instance == null) {
 				try {
 					mutex.wait(10000);
 				} catch (InterruptedException e) {