diff --git a/org.adempiere.ui.zk/WEB-INF/zk.xml b/org.adempiere.ui.zk/WEB-INF/zk.xml
index e26bfde163..e6c4579b4f 100644
--- a/org.adempiere.ui.zk/WEB-INF/zk.xml
+++ b/org.adempiere.ui.zk/WEB-INF/zk.xml
@@ -57,14 +57,14 @@
 		polling - org.zkoss.zkex.ui.impl.PollingServerPush
 		comet - org.zkoss.zkmax.ui.comet.CometServerPush ( enterprise edition only )
 	-->
-	<!--  device-config>
- 		<device-type>ajax</device-type>
-      	<server-push-class>fi.jawsy.jawwa.zk.atmosphere.AtmosphereServerPush</server-push-class>
-	</device-config -->
 	<device-config>
  		<device-type>ajax</device-type>
-      	<server-push-class>org.idempiere.ui.zk.websocket.WebSocketServerPush</server-push-class>
+      	<server-push-class>fi.jawsy.jawwa.zk.atmosphere.AtmosphereServerPush</server-push-class>
 	</device-config>
+	<!-- device-config>
+ 		<device-type>ajax</device-type>
+      	<server-push-class>org.idempiere.ui.zk.websocket.WebSocketServerPush</server-push-class>
+	</device-config -->
 
 	<!-- true for better performance and lower resource usage -->
 	<system-config>