diff --git a/akka-comet/src/main/scala/AkkaBroadcaster.scala b/akka-comet/src/main/scala/AkkaBroadcaster.scala
new file mode 100644
index 0000000000..70f36faff3
--- /dev/null
+++ b/akka-comet/src/main/scala/AkkaBroadcaster.scala
@@ -0,0 +1,7 @@
+/**
+ * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ */
+
+package se.scalablesolutions.akka.comet
+
+class AkkaBroadcaster extends org.atmosphere.jersey.util.JerseySimpleBroadcaster
\ No newline at end of file
diff --git a/akka-comet/src/main/scala/AkkaServlet.scala b/akka-comet/src/main/scala/AkkaServlet.scala
index c43d87c560..6e37d56c49 100644
--- a/akka-comet/src/main/scala/AkkaServlet.scala
+++ b/akka-comet/src/main/scala/AkkaServlet.scala
@@ -14,7 +14,6 @@ import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
 import org.atmosphere.container.GrizzlyCometSupport
 import org.atmosphere.cpr.{AtmosphereServlet, AtmosphereServletProcessor, AtmosphereResource, AtmosphereResourceEvent,CometSupport,CometSupportResolver,DefaultCometSupportResolver}
 import org.atmosphere.handler.{ReflectorServletProcessor, AbstractReflectorAtmosphereHandler}
-import org.atmosphere.jersey.JerseyBroadcaster
 
 /**
  * Akka's Comet servlet to be used when deploying actors exposed as Comet (and REST) services in a
@@ -51,8 +50,8 @@ class AkkaServlet extends org.atmosphere.cpr.AtmosphereServlet with Logging {
    */
   override def loadConfiguration(sc: ServletConfig) {
     config = new AtmosphereConfig { supportSession = false }
-    setDefaultBroadcasterClassName(classOf[JerseyBroadcaster].getName)
-    atmosphereHandlers.put("/*", new AtmosphereServlet.AtmosphereHandlerWrapper(servlet, new JerseyBroadcaster))
+    setDefaultBroadcasterClassName(classOf[AkkaBroadcaster].getName)
+    atmosphereHandlers.put("/*", new AtmosphereServlet.AtmosphereHandlerWrapper(servlet, new AkkaBroadcaster))
   }
 
    /**
diff --git a/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala b/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala
index f62e84e998..88c2a01504 100644
--- a/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala
+++ b/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala
@@ -132,13 +132,7 @@ class Chat extends Actor {
   @Suspend
   @GET
   @Produces(Array("text/html"))
-  def suspend = {
-      val s = new StringBuilder
-      s append "<!-- "
-      for(i <- 1 to 10) s append "Comet is a programming technique that enables web servers to send data to the client without having any need for the client to request it. "
-      s append " -->"
-      s toString
-  }
+  def suspend = ()
 
   def receive = {
     case Chat(who, what, msg) => {