diff --git a/service/internal/api/api_test.go b/service/internal/api/api_test.go
index eaca331..86bd1ec 100644
--- a/service/internal/api/api_test.go
+++ b/service/internal/api/api_test.go
@@ -640,12 +640,12 @@ func drainEventStreamUntilFinished(ch <-chan *apiv1.EventStreamResponse, timeout
 	deadline := time.Now().Add(timeout)
 	for time.Now().Before(deadline) {
 		ev, finished := recvEventStreamOne(ch, 50*time.Millisecond)
-		if finished {
-			return out
-		}
 		if ev != nil {
 			out = append(out, ev)
 		}
+		if finished {
+			return out
+		}
 	}
 	return out
 }