diff --git a/akka-samples/akka-sample-camel/src/main/resources/context-jms.xml b/akka-samples/akka-sample-camel/src/main/resources/context-jms.xml
index b3d811d8de..12e4541be3 100644
--- a/akka-samples/akka-sample-camel/src/main/resources/context-jms.xml
+++ b/akka-samples/akka-sample-camel/src/main/resources/context-jms.xml
@@ -13,7 +13,11 @@ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
   </bean>
 
   <bean id="jmsConfig" class="org.apache.camel.component.jms.JmsConfiguration">
-      <property name="connectionFactory" ref="jmsConnectionFactory"/>
+      <property name="connectionFactory" ref="singleConnectionFactory"/>
+  </bean>
+
+  <bean id="singleConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
+      <property name="targetConnectionFactory" ref="jmsConnectionFactory"/>
   </bean>
 
   <bean id="jmsConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
diff --git a/akka-samples/akka-sample-camel/src/main/scala/StandaloneApplication.scala b/akka-samples/akka-sample-camel/src/main/scala/StandaloneApplication.scala
index 80684be78a..ed858c4cc9 100644
--- a/akka-samples/akka-sample-camel/src/main/scala/StandaloneApplication.scala
+++ b/akka-samples/akka-sample-camel/src/main/scala/StandaloneApplication.scala
@@ -99,6 +99,9 @@ object StandaloneJmsApplication extends Application {
     CamelContextManager.mandatoryTemplate.sendBody(jmsUri, "Camel rocks (%d)" format i)
   }
 
+  // Wait a bit for subscribes to receive messages
+  Thread.sleep(1000)
+
   stopCamelService
   ActorRegistry.shutdownAll
 }