diff --git a/retrievalmarket/impl/integration_test.go b/retrievalmarket/impl/integration_test.go
index 729668957..68f902354 100644
--- a/retrievalmarket/impl/integration_test.go
+++ b/retrievalmarket/impl/integration_test.go
@@ -59,6 +59,7 @@ func TestClientCanMakeQueryToProvider(t *testing.T) {
 	t.Run("when piece is not found, returns unavailable", func(t *testing.T) {
 		expectedQR.PieceCIDFound = retrievalmarket.QueryItemUnavailable
 		expectedQR.Status = retrievalmarket.QueryResponseUnavailable
+		expectedQR.Message = "piece info for cid not found (deal has not been added to a piece yet)"
 		expectedQR.Size = 0
 		actualQR, err := client.Query(bgCtx, retrievalPeer, missingPiece, retrievalmarket.QueryParams{})
 		actualQR.MaxPaymentInterval = expectedQR.MaxPaymentInterval
diff --git a/retrievalmarket/impl/provider.go b/retrievalmarket/impl/provider.go
index df2b8ddfa..f18554321 100644
--- a/retrievalmarket/impl/provider.go
+++ b/retrievalmarket/impl/provider.go
@@ -344,6 +344,8 @@ func (p *Provider) HandleQueryStream(stream rmnet.RetrievalQueryStream) {
 		if !xerrors.Is(err, retrievalmarket.ErrNotFound) {
 			answer.Status = retrievalmarket.QueryResponseError
 			answer.Message = fmt.Sprintf("failed to fetch piece to retrieve from: %s", err)
+		} else {
+			answer.Message = "piece info for cid not found (deal has not been added to a piece yet)"
 		}
 
 		sendResp(answer)