diff --git a/internal/pkg/gateway/api.go b/internal/pkg/gateway/api.go
index f9396eff9dc..a0fc84959e1 100644
--- a/internal/pkg/gateway/api.go
+++ b/internal/pkg/gateway/api.go
@@ -88,7 +88,7 @@ func (gs *Server) Evaluate(ctx context.Context, request *gp.EvaluateRequest) (*g
 			endpointErr := errorDetail(endorser.endpointConfig, err)
 			errDetails = append(errDetails, endpointErr)
 			// this is a chaincode error response - don't retry
-			return nil, rpcError(codes.Aborted, "evaluate call to endorser returned an error response, see attached details for more info", errDetails...)
+			return nil, rpcError(codes.Aborted, "evaluate call to endorser returned error: "+response.Message, errDetails...)
 		}
 	}
 
diff --git a/internal/pkg/gateway/api_test.go b/internal/pkg/gateway/api_test.go
index dc1d56b7596..5050b951e02 100644
--- a/internal/pkg/gateway/api_test.go
+++ b/internal/pkg/gateway/api_test.go
@@ -316,7 +316,7 @@ func TestEvaluate(t *testing.T) {
 				proposalResponseStatus:  400,
 				proposalResponseMessage: "Mock chaincode error",
 			},
-			errString: "rpc error: code = Aborted desc = evaluate call to endorser returned an error response, see attached details for more info",
+			errString: "rpc error: code = Aborted desc = evaluate call to endorser returned error: Mock chaincode error",
 			errDetails: []*pb.ErrorDetail{{
 				Address: "peer1:8051",
 				MspId:   "msp1",