diff --git a/lib/server.dart b/lib/server.dart
index 6d06b6d1..ad2e3559 100644
--- a/lib/server.dart
+++ b/lib/server.dart
@@ -126,9 +126,7 @@ class AngelWebSocket {
       }
 
       var event = handleAction(action, socket);
-      if (event is Future)
-        event = await event;
-
+      if (event is Future) event = await event;
 
       if (event is WebSocketEvent) {
         batchEvent(event);
@@ -169,6 +167,10 @@ class AngelWebSocket {
       if (!WebSocketTransformer.isUpgradeRequest(req.underlyingRequest))
         throw new AngelHttpException.BadRequest();
 
+      res
+        ..willCloseItself = true
+        ..end();
+
       var ws = await WebSocketTransformer.upgrade(req.underlyingRequest);
       _clients.add(ws);
 
diff --git a/pubspec.yaml b/pubspec.yaml
index c3cd1f0d..6ac23378 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: angel_websocket
 description: WebSocket plugin for Angel
-version: 1.0.0-dev+2
+version: 1.0.0-dev+3
 author: thosakwe <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_websocket
 dependencies: