diff --git a/messaging/qpid/src/main/java/io/quarkus/ts/openshift/messaging/qpid/PriceConsumer.java b/messaging/qpid/src/main/java/io/quarkus/ts/openshift/messaging/qpid/PriceConsumer.java
index 73145d91..0359d5bb 100644
--- a/messaging/qpid/src/main/java/io/quarkus/ts/openshift/messaging/qpid/PriceConsumer.java
+++ b/messaging/qpid/src/main/java/io/quarkus/ts/openshift/messaging/qpid/PriceConsumer.java
@@ -48,7 +48,7 @@ public void run() {
             JMSConsumer consumer = context.createConsumer(context.createQueue("prices"));
             while (true) {
                 Message message = consumer.receive();
-                if (message == null) return;
+                if (message == null && (lastPrice != null || !lastPrice.isEmpty())) return;
                 lastPrice = message.getBody(String.class);
             }
         } catch (JMSException e) {
diff --git a/messaging/qpid/src/main/java/io/quarkus/ts/openshift/messaging/qpid/PriceProducer.java b/messaging/qpid/src/main/java/io/quarkus/ts/openshift/messaging/qpid/PriceProducer.java
index 45a9721b..7c827f5b 100644
--- a/messaging/qpid/src/main/java/io/quarkus/ts/openshift/messaging/qpid/PriceProducer.java
+++ b/messaging/qpid/src/main/java/io/quarkus/ts/openshift/messaging/qpid/PriceProducer.java
@@ -28,7 +28,7 @@ public class PriceProducer implements Runnable {
     private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
 
     void onStart(@Observes StartupEvent ev) {
-        scheduler.scheduleWithFixedDelay(this, 0L, 5L, TimeUnit.SECONDS);
+        scheduler.scheduleWithFixedDelay(this, 0L, 500L, TimeUnit.MILLISECONDS);
     }
 
     void onStop(@Observes ShutdownEvent ev) {
diff --git a/messaging/qpid/src/test/java/io/quarkus/ts/openshift/messaging/qpid/AbstractQPIDTest.java b/messaging/qpid/src/test/java/io/quarkus/ts/openshift/messaging/qpid/AbstractQPIDTest.java
index a2dca47c..5097a055 100644
--- a/messaging/qpid/src/test/java/io/quarkus/ts/openshift/messaging/qpid/AbstractQPIDTest.java
+++ b/messaging/qpid/src/test/java/io/quarkus/ts/openshift/messaging/qpid/AbstractQPIDTest.java
@@ -19,7 +19,7 @@ public abstract class AbstractQPIDTest {
     @Test
     @Order(1)
     public void testLastPrice() {
-        await().atMost(60, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(3, TimeUnit.MINUTES).untilAsserted(() -> {
             String value =
                     when()
                             .get("/prices/last")