diff --git a/libi2pd_client/I2PTunnel.cpp b/libi2pd_client/I2PTunnel.cpp
index 78634b7e..23a3ad52 100644
--- a/libi2pd_client/I2PTunnel.cpp
+++ b/libi2pd_client/I2PTunnel.cpp
@@ -346,7 +346,12 @@ namespace client
 					}
 				}
 				else
+				{
+					// insert incomplete line back
+					m_InHeader.clear ();
+					m_InHeader << line;
 					break;
+				}	
 			}
 
 			if (endOfHeader)
@@ -409,7 +414,7 @@ namespace client
 								matched = true;
 								break;
 							}
-						if (matched) break;
+						if (matched) continue;
 
 						// replace some headers
 						if (!m_Host.empty () && boost::iequals (line.substr (0, 5), "Host:"))
@@ -428,7 +433,12 @@ namespace client
 					}
 				}
 				else
+				{	
+					// insert incomplete line back
+					m_InHeader.clear ();
+					m_InHeader << line;
 					break;
+				}	
 			}
 
 			if (endOfHeader)
@@ -496,7 +506,12 @@ namespace client
 					}
 				}
 				else
+				{	
+					// insert incomplete line back
+					m_InHeader.clear ();
+					m_InHeader << line;
 					break;
+				}	
 			}
 
 			if (endOfHeader)