diff --git a/p2p/src/protocol.rs b/p2p/src/protocol.rs
index 330f05313..b30837323 100644
--- a/p2p/src/protocol.rs
+++ b/p2p/src/protocol.rs
@@ -186,7 +186,7 @@ impl MessageHandler for Protocol {
 					let headers: Headers = headers_streaming_body(
 						conn,
 						msg.header.msg_len,
-						8,
+						32,
 						&mut total_read,
 						&mut reserved,
 						header_size,
diff --git a/servers/src/grin/sync/state_sync.rs b/servers/src/grin/sync/state_sync.rs
index c834f0e27..a9b598a37 100644
--- a/servers/src/grin/sync/state_sync.rs
+++ b/servers/src/grin/sync/state_sync.rs
@@ -123,6 +123,19 @@ impl StateSync {
 					}
 					Err(e) => self.sync_state.set_sync_error(Error::P2P(e)),
 				}
+
+				// to avoid the confusing log,
+				// update the final HeaderSync state mainly for 'current_height'
+				{
+					let status = self.sync_state.status();
+					if let SyncStatus::HeaderSync { .. } = status {
+						self.sync_state.update(SyncStatus::HeaderSync {
+							current_height: header_head.height,
+							highest_height,
+						});
+					}
+				}
+
 				self.sync_state.update(SyncStatus::TxHashsetDownload);
 			}
 		}