diff --git a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
index c77799ab4d..4ef1f87f2d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
+++ b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
@@ -56,6 +56,6 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI).
 	<javascript package="org.idempiere.websocket" merge="false" />
 	<javascript package="adempiere.local.storage" merge="false" />
 	
-	<javascript-module name="jawwa.atmosphere" version="202011161530"/>
+	<javascript-module name="jawwa.atmosphere" version="202011170510"/>
 	<javascript-module name="adempiere.local.storage" version="202011151100"/>
 </language>
diff --git a/org.adempiere.ui.zk/WEB-INF/src/web/js/jawwa/atmosphere/serverpush.js b/org.adempiere.ui.zk/WEB-INF/src/web/js/jawwa/atmosphere/serverpush.js
index c8277f3726..b365ad2122 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/web/js/jawwa/atmosphere/serverpush.js
+++ b/org.adempiere.ui.zk/WEB-INF/src/web/js/jawwa/atmosphere/serverpush.js
@@ -41,7 +41,7 @@
       this.ajaxOptions.error = function(jqxhr, textStatus, errorThrown) {
     	  if (me.trace)
     		  console.log("error: " + textStatus + " dtid: " + me.desktop.id);
-    	  if (textStatus != "timeout" && textStatus != "abort") {
+    	  if (textStatus != "timeout" && textStatus != "abort" && errorThrown != "SessionNotFound") {
 	          if (typeof console == "object") {
 	        	  console.error(textStatus);
 	              console.error(errorThrown);
@@ -59,7 +59,7 @@
     	  if (me.trace)
     		  console.log("complete"+ " dtid: " + me.desktop.id);
     	  if (me._req && me._req.statusText == "SessionNotFound" && me._req.status == 400) {
-    		  me._timeout();
+    		  ;
     	  } else {
     		  me._schedule();
     	  }
@@ -71,7 +71,7 @@
         setTimeout(this.proxy(this._send), this.delay);
       } else {
         this.stop();
-        this._serverError();
+        jawwa.atmosphere.serverNotAvailable();
       }
     },
     _send: function() {
@@ -100,19 +100,20 @@
         this._req.abort();
         this._req = null;
       }
-    },
-    _timeout: function() {
-    	_serverError();
-    },
-    _serverError: function() {
-    	zk.confirmClose = false;
+    }
+  });
+  jawwa.atmosphere.serverNotAvailable = function() {
+    	zk.confirmClose = false;    	
     	adempiere.get("zkTimeoutText", function(ok, val) {
 			if (ok && !!val)
 			{
+				zk.errorDismiss();
 				alert(val);
 			}
 			window.location.href="index.zul";
 		});
-    }
-  });
+   };
+   jawwa.atmosphere.sessionTimeout = function() {
+   		jawwa.atmosphere.serverNotAvailable();
+   };
 })();
diff --git a/org.adempiere.ui.zk/WEB-INF/zk.xml b/org.adempiere.ui.zk/WEB-INF/zk.xml
index 9ffd114c7a..736c91969a 100644
--- a/org.adempiere.ui.zk/WEB-INF/zk.xml
+++ b/org.adempiere.ui.zk/WEB-INF/zk.xml
@@ -40,6 +40,11 @@
 		<device-type>ajax</device-type>
 		<automatic-timeout>true</automatic-timeout>
 		<timeout-uri>/timeout.zul</timeout-uri>
+		<!--
+		Comment out timeout-uri above and un-comment timeout-message below if you prefer timeout 
+		message alert over a timeout page
+		<timeout-message>script:<![CDATA[jawwa.atmosphere.sessionTimeout();]]></timeout-message>
+		 -->		
 	</session-config>
 
 	<!--