diff --git a/org.adempiere.ui.zk/WEB-INF/zk-websocket-serverpush.xml b/org.adempiere.ui.zk/WEB-INF/zk-websocket-serverpush.xml
new file mode 100644
index 0000000000..5a6e8430af
--- /dev/null
+++ b/org.adempiere.ui.zk/WEB-INF/zk-websocket-serverpush.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE zk>
+
+	<!--
+		zk.xml Copyright (C) 2006 Potix Corporation. All Rights Reserved.
+	-->
+
+<zk>
+	<device-config>
+ 		<device-type>ajax</device-type>
+      	<server-push-class>org.idempiere.ui.zk.websocket.WebSocketServerPush</server-push-class>
+	</device-config>
+</zk>
\ No newline at end of file
diff --git a/org.adempiere.ui.zk/WEB-INF/zk.xml b/org.adempiere.ui.zk/WEB-INF/zk.xml
index 10eb855cce..f32f278638 100644
--- a/org.adempiere.ui.zk/WEB-INF/zk.xml
+++ b/org.adempiere.ui.zk/WEB-INF/zk.xml
@@ -61,10 +61,6 @@
  		<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>
-	</device-config -->
 
 	<!-- true for better performance and lower resource usage -->
 	<system-config>