diff --git a/src/context.rs b/src/context.rs
index 99433d29d..5187dd0b9 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -27,6 +27,15 @@ pub enum Frame {
     Drain(oneshot::Sender<()>),
 }
 
+impl Frame {
+    pub fn len(&self) -> usize {
+        match *self {
+            Frame::Chunk(Some(ref bin)) => bin.len(),
+            _ => 0,
+        }
+    }
+}
+
 /// Http actor execution context
 pub struct HttpContext<A, S=()> where A: Actor<Context=HttpContext<A, S>>,
 {
diff --git a/src/ws/context.rs b/src/ws/context.rs
index 2fa3c7647..33f6f6964 100644
--- a/src/ws/context.rs
+++ b/src/ws/context.rs
@@ -58,7 +58,8 @@ impl<A, S> AsyncContext<A> for WebsocketContext<A, S> where A: Actor<Context=Sel
     #[doc(hidden)]
     #[inline]
     fn waiting(&self) -> bool {
-        self.inner.wating()
+        self.inner.wating() || self.inner.start() == ActorState::Stopping ||
+            self.inner.start() == ActorState::Stopped
     }
 
     fn cancel_future(&mut self, handle: SpawnHandle) -> bool {