diff --git a/websockify/websocket.py b/websockify/websocket.py
index ffa9b90..c9c35b3 100644
--- a/websockify/websocket.py
+++ b/websockify/websocket.py
@@ -327,21 +327,7 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler):
                     opcode = 1
                 else:
                     opcode = 2
-                encbufs = self.send_hybi(buf, opcode, base64=self.base64, record=self.rec)
-
-        while self.send_parts:
-            # Send pending frames
-            buf = self.send_parts.pop(0)
-            sent = self.request.send(buf)
-
-            if sent == len(buf):
-                self.print_traffic("<")
-            else:
-                self.print_traffic("<.")
-                self.send_parts.insert(0, buf[sent:])
-                break
-
-        return len(self.send_parts)
+                self.send_hybi(buf, opcode, base64=self.base64, record=self.rec)
 
     def recv_frames(self):
         """ Receive and decode WebSocket frames.
@@ -494,7 +480,6 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler):
             # Indicate to server that a Websocket upgrade was done
             self.server.ws_connection = True
             # Initialize per client settings
-            self.send_parts = []
             self.recv_part  = None
             self.start_time = int(time.time()*1000)
 
diff --git a/websockify/websocketproxy.py b/websockify/websocketproxy.py
index 837d801..dfda54a 100755
--- a/websockify/websocketproxy.py
+++ b/websockify/websocketproxy.py
@@ -137,7 +137,6 @@ Traffic Legend:
         Proxy client WebSocket to normal target socket.
         """
         cqueue = []
-        c_pend = 0
         tqueue = []
         rlist = [self.request, target]
 
@@ -157,7 +156,7 @@ Traffic Legend:
                     self.send_ping()
 
             if tqueue: wlist.append(target)
-            if cqueue or c_pend: wlist.append(self.request)
+            if cqueue: wlist.append(self.request)
             try:
                 ins, outs, excepts = select.select(rlist, wlist, [], 1)
             except (select.error, OSError):
@@ -176,7 +175,7 @@ Traffic Legend:
 
             if self.request in outs:
                 # Send queued target data to the client
-                c_pend = self.send_frames(cqueue)
+                self.send_frames(cqueue)
 
                 cqueue = []