diff --git a/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java b/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java
index 8fc426418a..4891a7fb85 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java
@@ -122,7 +122,7 @@ public class AtmosphereServerPush implements ServerPush {
 
     private boolean commitResponse() throws IOException {    	
         AtmosphereResource resource = this.resource.getAndSet(null);
-        if (resource != null && resource.isSuspended()) {
+        if (resource != null) {
         	resource.resume();
         	return true;
         } 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/ZkAtmosphereHandler.java b/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/ZkAtmosphereHandler.java
index 948025f23a..4dd9f6a713 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/ZkAtmosphereHandler.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/ZkAtmosphereHandler.java
@@ -53,7 +53,8 @@ public class ZkAtmosphereHandler implements AtmosphereHandler {
         if (session.getWebApp() instanceof WebAppCtrl) {
         	WebAppCtrl webAppCtrl = (WebAppCtrl) session.getWebApp();
         	Desktop desktop = webAppCtrl.getDesktopCache(session).getDesktopIfAny(dtid);
-        	log.warn("Could not find desktop: " + dtid);
+        	if (desktop == null)
+        		log.warn("Could not find desktop: " + dtid);
             return new Either<String, Desktop>("Could not find desktop", desktop);
         }
         return new Either<String, Desktop>("Webapp does not implement WebAppCtrl", null);