diff --git a/${activemq.data}/kahadb/db.data b/${activemq.data}/kahadb/db.data
index 1df822af..1ee602fb 100644
Binary files a/${activemq.data}/kahadb/db.data and b/${activemq.data}/kahadb/db.data differ
diff --git a/${activemq.data}/kahadb/db.redo b/${activemq.data}/kahadb/db.redo
index 9d363232..650438ec 100644
Binary files a/${activemq.data}/kahadb/db.redo and b/${activemq.data}/kahadb/db.redo differ
diff --git a/${activemq.data}/kahadb/lock b/${activemq.data}/kahadb/lock
index f0ea4c03..c89d14d6 100644
Binary files a/${activemq.data}/kahadb/lock and b/${activemq.data}/kahadb/lock differ
diff --git a/src/main/webapp/app/entities/flow/editor/flow-editor-esb.component.ts b/src/main/webapp/app/entities/flow/editor/flow-editor-esb.component.ts
index b94eb1f4..7108cce3 100644
--- a/src/main/webapp/app/entities/flow/editor/flow-editor-esb.component.ts
+++ b/src/main/webapp/app/entities/flow/editor/flow-editor-esb.component.ts
@@ -52,6 +52,7 @@ export class FlowEditorEsbComponent implements OnInit, OnDestroy {
 
 	public stepTypes = ["SOURCE", "ACTION", "SINK", "ROUTE", "SCRIPT", "CONNECTION", "ERROR"];
   public languageComponentsNames: Array<any> = ['groovy','java','javascript','jslt','python','simple','xslt'];
+  public componentsWithConnection: Array<any> = ['amazonmq','amqp','amqps','jms','sjms','sjms2','sql','ibmmq','sonicmq'];
 
 	public logLevelListType = [
 		LogLevelType.OFF,
@@ -508,6 +509,12 @@ export class FlowEditorEsbComponent implements OnInit, OnDestroy {
           this.enableMessage[stepFormIndex] = false;
         }
 
+        if(this.componentsWithConnection.includes(componentType)){
+          this.enableConnection[stepFormIndex] = true;
+        }else{
+          this.enableConnection[stepFormIndex] = false;
+        }
+
     }
 
     if(stepForm){