diff --git a/lib/handshake.c b/lib/handshake.c
index f004ad0d..856297db 100644
--- a/lib/handshake.c
+++ b/lib/handshake.c
@@ -164,7 +164,10 @@ http_postbody:
 						goto bail;
 				}
 				goto http_complete;
-			}
+			} else
+				libwebsocket_set_timeout(wsi,
+					PENDING_TIMEOUT_HTTP_CONTENT,
+					AWAITING_TIMEOUT);
 		}
 		break;