diff --git a/akka-samples-chat/src/main/scala/ChatServer.scala b/akka-samples-chat/src/main/scala/ChatServer.scala
index 978e5f9eb3..5a34b614d7 100644
--- a/akka-samples-chat/src/main/scala/ChatServer.scala
+++ b/akka-samples-chat/src/main/scala/ChatServer.scala
@@ -118,10 +118,12 @@ object ChatServer extends Actor {
     case msg @ GetChatLog(from) =>     sessions(from) forward msg
   }
   
-  override def shutdown = sessions.foreach { case (_, session) => 
-    log.info("Chat server is shutting down...")
-    unlink(session)
-    session.stop
+  override def shutdown = { 
+    sessions.foreach { case (_, session) => 
+      log.info("Chat server is shutting down...")
+      unlink(session)
+      session.stop
+    }
     unlink(storage)
     storage.stop
   }