diff --git a/lib/features/modeling/BpmnLayouter.js b/lib/features/modeling/BpmnLayouter.js
index 5857f438..0ccef9ea 100644
--- a/lib/features/modeling/BpmnLayouter.js
+++ b/lib/features/modeling/BpmnLayouter.js
@@ -31,11 +31,13 @@ inherits(BpmnLayouter, BaseLayouter);
 
 
 BpmnLayouter.prototype.layoutConnection = function(connection, hints) {
-  hints = hints || {};
+  if (!hints) {
+    hints = {};
+  }
 
   var source = hints.source || connection.source,
       target = hints.target || connection.target,
-      waypoints = connection.waypoints,
+      waypoints = hints.waypoints || connection.waypoints,
       start = hints.connectionStart,
       end = hints.connectionEnd;