diff --git a/webssh/handler.py b/webssh/handler.py
index 6ea85ec..27d3736 100644
--- a/webssh/handler.py
+++ b/webssh/handler.py
@@ -405,7 +405,8 @@ class WsockHandler(MixinHandler, tornado.websocket.WebSocketHandler):
             worker = workers.get(worker_id)
             if worker:
                 workers[worker_id] = None
-                self.set_nodelay(True)
+                if self.stream:
+                    self.set_nodelay(True)
                 worker.set_handler(self)
                 self.worker_ref = weakref.ref(worker)
                 self.loop.add_handler(worker.fd, worker, IOLoop.READ)