diff --git a/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java
index ce3b3999733..dae1c9c033c 100644
--- a/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java
@@ -188,9 +188,9 @@ public AtmosphereFramework addInitParameter(String name,
                 "false");
         // Disable heartbeat (it does not emit correct events client side)
         // https://github.com/Atmosphere/atmosphere-javascript/issues/141
-        atmosphere.addInitParameter(
-                ApplicationConfig.DISABLE_ATMOSPHEREINTERCEPTORS,
-                HeartbeatInterceptor.class.getName());
+        //atmosphere.addInitParameter(
+        //        ApplicationConfig.DISABLE_ATMOSPHEREINTERCEPTORS,
+        //        HeartbeatInterceptor.class.getName());
 
         final String bufferSize = String
                 .valueOf(PushConstants.WEBSOCKET_BUFFER_SIZE);