diff --git a/tap/extensions/kafka/main.go b/tap/extensions/kafka/main.go
index 175a3f9cf..8dc9219cf 100644
--- a/tap/extensions/kafka/main.go
+++ b/tap/extensions/kafka/main.go
@@ -38,9 +38,15 @@ func (d dissecting) Ping() {
 func (d dissecting) Dissect(b *bufio.Reader, isClient bool, tcpID *api.TcpID, emitter api.Emitter) {
 	for {
 		if isClient {
-			ReadRequest(b, tcpID)
+			_, _, err := ReadRequest(b, tcpID)
+			if err != nil {
+				break
+			}
 		} else {
-			ReadResponse(b, tcpID, emitter)
+			err := ReadResponse(b, tcpID, emitter)
+			if err != nil {
+				break
+			}
 		}
 	}
 }