diff --git a/ports/jms/src/main/java/org/openengsb/ports/jms/JMSTemplateFactoryImpl.java b/ports/jms/src/main/java/org/openengsb/ports/jms/JMSTemplateFactoryImpl.java
index <HASH>..<HASH> 100644
--- a/ports/jms/src/main/java/org/openengsb/ports/jms/JMSTemplateFactoryImpl.java
+++ b/ports/jms/src/main/java/org/openengsb/ports/jms/JMSTemplateFactoryImpl.java
@@ -32,7 +32,7 @@ public class JMSTemplateFactoryImpl implements JMSTemplateFactory {
     private final Map<String, ConnectionFactory> connections = new HashMap<String, ConnectionFactory>();
 
     @Override
-    public JmsTemplate createJMSTemplate(String host) {
+    public synchronized JmsTemplate createJMSTemplate(String host) {
         if (!connections.containsKey(host)) {
             connections.put(host, new SingleConnectionFactory(new ActiveMQConnectionFactory(host)));
         }
[OPENENGSB-<I>] Make JMSTemplateFactory thread safe