diff --git a/websocket_server/websocket_server.py b/websocket_server/websocket_server.py
index fc50b8e..9891022 100644
--- a/websocket_server/websocket_server.py
+++ b/websocket_server/websocket_server.py
@@ -293,7 +293,9 @@ def send_text(self, message, opcode=OPCODE_TEXT):
         self.request.send(header + payload)
 
     def handshake(self):
-        message = self.request.recv(1024).decode().strip()
+        message = self.request.recv(1024).decode()
+        if not message.endswith("\r\n\r\n"):
+            message +=self.request.recv(1024).decode()
         upgrade = re.search('\nupgrade[\s]*:[\s]*websocket', message.lower())
         if not upgrade:
             self.keep_alive = False