diff --git a/internal/metadata/job.go b/internal/metadata/job.go
index b6448bf..97bf08a 100644
--- a/internal/metadata/job.go
+++ b/internal/metadata/job.go
@@ -47,8 +47,8 @@ func (j *Job) Wait(ctx context.Context) (*internaltypes.QueryResponse, error) {
 	j.mu.Lock()
 	defer j.mu.Unlock()
 
-	if j.response != nil {
-		return j.response, nil
+	if j.response != nil || j.err != nil {
+		return j.response, j.err
 	}
 
 	ticker := time.NewTicker(100 * time.Millisecond)