diff --git a/pkg/bs_rpc/client.go b/pkg/bs_rpc/client.go
index 792505cc..e8ecb099 100644
--- a/pkg/bs_rpc/client.go
+++ b/pkg/bs_rpc/client.go
@@ -125,7 +125,11 @@ func (c Client) Listen(ctx context.Context) error {
 				errorCh <- c.handleMsg(ctx, m)
 			}()
 
-			msgBuf = bytes.Join(msgParts[1:], ENDSECTION)
+			if len(msgParts[1]) != 0 {
+				msgBuf = bytes.Join(msgParts[1:], ENDSECTION)
+			} else {
+				msgBuf = []byte{}
+			}
 		}
 	}
 }