diff --git a/protocol/blockfetch/client.go b/protocol/blockfetch/client.go
index 31697c20..d1bcad7a 100644
--- a/protocol/blockfetch/client.go
+++ b/protocol/blockfetch/client.go
@@ -124,7 +124,7 @@ func (c *Client) GetBlock(point common.Point) (ledger.Block, error) {
 	return block, nil
 }
 
-func (c *Client) messageHandler(msg protocol.Message, isResponse bool) error {
+func (c *Client) messageHandler(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeStartBatch:
diff --git a/protocol/blockfetch/server.go b/protocol/blockfetch/server.go
index 4f749c3d..14b8838a 100644
--- a/protocol/blockfetch/server.go
+++ b/protocol/blockfetch/server.go
@@ -44,7 +44,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
 	return s
 }
 
-func (s *Server) messageHandler(msg protocol.Message, isResponse bool) error {
+func (s *Server) messageHandler(msg protocol.Message) error {
 	var err error
 	// TODO: add cases for messages from client
 	switch msg.Type() {
diff --git a/protocol/chainsync/client.go b/protocol/chainsync/client.go
index 8f573958..45193e95 100644
--- a/protocol/chainsync/client.go
+++ b/protocol/chainsync/client.go
@@ -96,7 +96,7 @@ func NewClient(protoOptions protocol.ProtocolOptions, cfg *Config) *Client {
 	return c
 }
 
-func (c *Client) messageHandler(msg protocol.Message, isResponse bool) error {
+func (c *Client) messageHandler(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeAwaitReply:
diff --git a/protocol/chainsync/server.go b/protocol/chainsync/server.go
index 6e06e2ec..3cfb420d 100644
--- a/protocol/chainsync/server.go
+++ b/protocol/chainsync/server.go
@@ -54,7 +54,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
 	return s
 }
 
-func (s *Server) messageHandler(msg protocol.Message, isResponse bool) error {
+func (s *Server) messageHandler(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeRequestNext:
diff --git a/protocol/handshake/client.go b/protocol/handshake/client.go
index bd39cb7f..0e4cf8e2 100644
--- a/protocol/handshake/client.go
+++ b/protocol/handshake/client.go
@@ -70,7 +70,7 @@ func (c *Client) Start() {
 	})
 }
 
-func (c *Client) handleMessage(msg protocol.Message, isResponse bool) error {
+func (c *Client) handleMessage(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeAcceptVersion:
diff --git a/protocol/handshake/server.go b/protocol/handshake/server.go
index cf981880..96d74420 100644
--- a/protocol/handshake/server.go
+++ b/protocol/handshake/server.go
@@ -47,7 +47,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
 	return s
 }
 
-func (s *Server) handleMessage(msg protocol.Message, isResponse bool) error {
+func (s *Server) handleMessage(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeProposeVersions:
diff --git a/protocol/keepalive/client.go b/protocol/keepalive/client.go
index 04fff1a5..c711c364 100644
--- a/protocol/keepalive/client.go
+++ b/protocol/keepalive/client.go
@@ -86,7 +86,7 @@ func (c *Client) startTimer() {
 	})
 }
 
-func (c *Client) messageHandler(msg protocol.Message, isResponse bool) error {
+func (c *Client) messageHandler(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeKeepAliveResponse:
diff --git a/protocol/keepalive/server.go b/protocol/keepalive/server.go
index d2b3ada4..cc238909 100644
--- a/protocol/keepalive/server.go
+++ b/protocol/keepalive/server.go
@@ -44,7 +44,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
 	return s
 }
 
-func (s *Server) messageHandler(msg protocol.Message, isResponse bool) error {
+func (s *Server) messageHandler(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeKeepAlive:
diff --git a/protocol/localstatequery/client.go b/protocol/localstatequery/client.go
index b64f365c..91649030 100644
--- a/protocol/localstatequery/client.go
+++ b/protocol/localstatequery/client.go
@@ -91,7 +91,7 @@ func NewClient(protoOptions protocol.ProtocolOptions, cfg *Config) *Client {
 	return c
 }
 
-func (c *Client) messageHandler(msg protocol.Message, isResponse bool) error {
+func (c *Client) messageHandler(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeAcquired:
diff --git a/protocol/localstatequery/server.go b/protocol/localstatequery/server.go
index b7266401..e10f3fbf 100644
--- a/protocol/localstatequery/server.go
+++ b/protocol/localstatequery/server.go
@@ -58,7 +58,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
 	return s
 }
 
-func (s *Server) messageHandler(msg protocol.Message, isResponse bool) error {
+func (s *Server) messageHandler(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeAcquire:
diff --git a/protocol/localtxmonitor/client.go b/protocol/localtxmonitor/client.go
index 247b5d09..0d1dcad1 100644
--- a/protocol/localtxmonitor/client.go
+++ b/protocol/localtxmonitor/client.go
@@ -83,7 +83,7 @@ func NewClient(protoOptions protocol.ProtocolOptions, cfg *Config) *Client {
 	return c
 }
 
-func (c *Client) messageHandler(msg protocol.Message, isResponse bool) error {
+func (c *Client) messageHandler(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeAcquired:
diff --git a/protocol/localtxmonitor/server.go b/protocol/localtxmonitor/server.go
index 2665147f..5497b6fa 100644
--- a/protocol/localtxmonitor/server.go
+++ b/protocol/localtxmonitor/server.go
@@ -52,7 +52,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
 	return s
 }
 
-func (s *Server) messageHandler(msg protocol.Message, isResponse bool) error {
+func (s *Server) messageHandler(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeAcquire:
diff --git a/protocol/localtxsubmission/client.go b/protocol/localtxsubmission/client.go
index f235c417..75eaf6e6 100644
--- a/protocol/localtxsubmission/client.go
+++ b/protocol/localtxsubmission/client.go
@@ -69,7 +69,7 @@ func NewClient(protoOptions protocol.ProtocolOptions, cfg *Config) *Client {
 	return c
 }
 
-func (c *Client) messageHandler(msg protocol.Message, isResponse bool) error {
+func (c *Client) messageHandler(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeAcceptTx:
diff --git a/protocol/localtxsubmission/server.go b/protocol/localtxsubmission/server.go
index 69073ddb..67d10d45 100644
--- a/protocol/localtxsubmission/server.go
+++ b/protocol/localtxsubmission/server.go
@@ -48,7 +48,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
 	return s
 }
 
-func (s *Server) messageHandler(msg protocol.Message, isResponse bool) error {
+func (s *Server) messageHandler(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeSubmitTx:
diff --git a/protocol/peersharing/client.go b/protocol/peersharing/client.go
index a92a07d5..b65c9e18 100644
--- a/protocol/peersharing/client.go
+++ b/protocol/peersharing/client.go
@@ -69,7 +69,7 @@ func (c *Client) GetPeers(amount uint8) ([]interface{}, error) {
 	return peers, nil
 }
 
-func (c *Client) handleMessage(msg protocol.Message, isResponse bool) error {
+func (c *Client) handleMessage(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeSharePeers:
diff --git a/protocol/peersharing/server.go b/protocol/peersharing/server.go
index 0f211410..b076ad89 100644
--- a/protocol/peersharing/server.go
+++ b/protocol/peersharing/server.go
@@ -47,7 +47,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
 	return s
 }
 
-func (s *Server) handleMessage(msg protocol.Message, isResponse bool) error {
+func (s *Server) handleMessage(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeShareRequest:
diff --git a/protocol/protocol.go b/protocol/protocol.go
index 57eab26c..b7b08291 100644
--- a/protocol/protocol.go
+++ b/protocol/protocol.go
@@ -93,7 +93,7 @@ type ProtocolOptions struct {
 }
 
 // MessageHandlerFunc represents a function that handles an incoming message
-type MessageHandlerFunc func(Message, bool) error
+type MessageHandlerFunc func(Message) error
 
 // MessageFromCborFunc represents a function that parses a mini-protocol message
 type MessageFromCborFunc func(uint, []byte) (Message, error)
@@ -316,7 +316,6 @@ func (p *Protocol) sendLoop() {
 func (p *Protocol) recvLoop() {
 	defer p.waitGroup.Done()
 	leftoverData := false
-	isResponse := false
 	for {
 		var err error
 		// Don't grab the next segment from the muxer if we still have data in the buffer
@@ -333,8 +332,6 @@ func (p *Protocol) recvLoop() {
 				}
 				// Add segment payload to buffer
 				p.recvBuffer.Write(segment.Payload)
-				// Save whether it's a response
-				isResponse = segment.IsResponse()
 			}
 		}
 		leftoverData = false
@@ -383,7 +380,7 @@ func (p *Protocol) recvLoop() {
 			return
 		}
 		// Handle message
-		if err := p.handleMessage(msg, isResponse); err != nil {
+		if err := p.handleMessage(msg); err != nil {
 			p.SendError(err)
 			return
 		}
@@ -470,7 +467,7 @@ func (p *Protocol) setState(state State) {
 	}
 }
 
-func (p *Protocol) handleMessage(msg Message, isResponse bool) error {
+func (p *Protocol) handleMessage(msg Message) error {
 	// Lock the state to prevent collisions
 	p.stateMutex.Lock()
 	newState, err := p.getNewState(msg)
@@ -481,5 +478,5 @@ func (p *Protocol) handleMessage(msg Message, isResponse bool) error {
 	p.setState(newState)
 	p.stateMutex.Unlock()
 	// Call handler function
-	return p.config.MessageHandlerFunc(msg, isResponse)
+	return p.config.MessageHandlerFunc(msg)
 }
diff --git a/protocol/txsubmission/client.go b/protocol/txsubmission/client.go
index 5b680293..466fec6a 100644
--- a/protocol/txsubmission/client.go
+++ b/protocol/txsubmission/client.go
@@ -67,7 +67,7 @@ func (c *Client) Init() {
 	})
 }
 
-func (c *Client) messageHandler(msg protocol.Message, isResponse bool) error {
+func (c *Client) messageHandler(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeRequestTxIds:
diff --git a/protocol/txsubmission/server.go b/protocol/txsubmission/server.go
index f5a33277..0a08e5ab 100644
--- a/protocol/txsubmission/server.go
+++ b/protocol/txsubmission/server.go
@@ -57,7 +57,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
 	return s
 }
 
-func (s *Server) messageHandler(msg protocol.Message, isResponse bool) error {
+func (s *Server) messageHandler(msg protocol.Message) error {
 	var err error
 	switch msg.Type() {
 	case MessageTypeReplyTxIds: