diff --git a/run-document-server.sh b/run-document-server.sh
index bebec70353a80526ca5e1d699ebcea6fdc412590..c46c6b0b19a9b3a72c7fd03f683a2d5b707585ae 100755
--- a/run-document-server.sh
+++ b/run-document-server.sh
@@ -109,6 +109,7 @@ parse_rabbitmq_url(){
   # extract the path (if any)
   local path="$(echo $url | grep / | cut -d/ -f2-)"
 
+  AMQP_SERVER_PROTO=${proto:0:-3}
   AMQP_SERVER_HOST=$host
   AMQP_SERVER_USER=$user
   AMQP_SERVER_PASS=$pass
@@ -176,6 +177,15 @@ update_rabbitmq_setting(){
     else
       ${JSON} -I -e "delete this.activemq.connectOptions.password"
     fi
+
+    case "${AMQP_SERVER_PROTO}" in
+      amqp+ssl|amqps)
+        ${JSON} -I -e "this.activemq.connectOptions.transport = 'tls'"
+        ;;
+      *)
+        ${JSON} -I -e "delete this.activemq.connectOptions.transport"
+        ;;
+    esac 
   fi
 }