diff --git a/charts/cp-kafka/templates/tests/canary-pod.yaml b/charts/cp-kafka/templates/tests/canary-pod.yaml
index ce871d7b..feaa1ddb 100644
--- a/charts/cp-kafka/templates/tests/canary-pod.yaml
+++ b/charts/cp-kafka/templates/tests/canary-pod.yaml
@@ -23,5 +23,5 @@ spec:
       # Produce a test message to the topic
       echo "$MESSAGE" | kafka-console-producer --broker-list {{ template "cp-kafka.fullname" . }}:9092 --topic {{ template "cp-kafka.fullname" . }}-canary-topic && \
       # Consume a test message from the topic
-      kafka-console-consumer --bootstrap-server {{ template "cp-kafka.fullname" . }}-headless:9092 --topic {{ template "cp-kafka.fullname" . }}-canary-topic --from-beginning --timeout-ms 2000 | grep "$MESSAGE"
+      kafka-console-consumer --bootstrap-server {{ template "cp-kafka.fullname" . }}-headless:9092 --topic {{ template "cp-kafka.fullname" . }}-canary-topic --from-beginning --max-messages 1 --timeout-ms 30000 | grep "$MESSAGE"
   restartPolicy: Never
\ No newline at end of file