diff --git a/src/container/EdgeRenderer/index.tsx b/src/container/EdgeRenderer/index.tsx
index 6d6453cf..8f11bac9 100644
--- a/src/container/EdgeRenderer/index.tsx
+++ b/src/container/EdgeRenderer/index.tsx
@@ -10,21 +10,23 @@ import {
   Edge,
   Node,
   Elements,
+  Connection,
   ConnectionLineType,
   ConnectionLineComponent,
+  ConnectionMode,
   Transform,
   OnEdgeUpdateFunc,
-  Connection,
 } from '../../types';
 
 interface EdgeRendererProps {
   edgeTypes: any;
   connectionLineType: ConnectionLineType;
   connectionLineStyle?: CSSProperties;
+  connectionLineComponent?: ConnectionLineComponent;
+  connectionMode?: ConnectionMode;
   onElementClick?: (event: React.MouseEvent, element: Node | Edge) => void;
   arrowHeadColor: string;
   markerEndId?: string;
-  connectionLineComponent?: ConnectionLineComponent;
   onlyRenderVisibleElements: boolean;
   onEdgeUpdate?: OnEdgeUpdateFunc;
 }
@@ -39,6 +41,7 @@ interface EdgeWrapperProps {
   width: number;
   height: number;
   onlyRenderVisibleElements: boolean;
+  connectionMode?: ConnectionMode;
 }
 
 const Edge = ({
@@ -51,6 +54,7 @@ const Edge = ({
   width,
   height,
   onlyRenderVisibleElements,
+  connectionMode,
 }: EdgeWrapperProps) => {
   const sourceHandleId = edge.sourceHandle || null;
   const targetHandleId = edge.targetHandle || null;
@@ -79,8 +83,14 @@ const Edge = ({
 
   const edgeType = edge.type || 'default';
   const EdgeComponent = props.edgeTypes[edgeType] || props.edgeTypes.default;
+  const targetNodeBounds = targetNode.__rf.handleBounds;
+  // when connection type is loose we can define all handles as sources
+  const targetNodeHandles =
+    connectionMode === ConnectionMode.Strict
+      ? targetNodeBounds.target
+      : targetNodeBounds.target || targetNodeBounds.source;
   const sourceHandle = getHandle(sourceNode.__rf.handleBounds.source, sourceHandleId);
-  const targetHandle = getHandle(targetNode.__rf.handleBounds.target, targetHandleId);
+  const targetHandle = getHandle(targetNodeHandles, targetHandleId);
   const sourcePosition = sourceHandle ? sourceHandle.position : Position.Bottom;
   const targetPosition = targetHandle ? targetHandle.position : Position.Top;
 
diff --git a/src/container/GraphView/index.tsx b/src/container/GraphView/index.tsx
index 9a649e07..944e3883 100644
--- a/src/container/GraphView/index.tsx
+++ b/src/container/GraphView/index.tsx
@@ -242,9 +242,10 @@ const GraphView = ({
         onElementClick={onElementClick}
         connectionLineType={connectionLineType}
         connectionLineStyle={connectionLineStyle}
+        connectionLineComponent={connectionLineComponent}
+        connectionMode={connectionMode}
         arrowHeadColor={arrowHeadColor}
         markerEndId={markerEndId}
-        connectionLineComponent={connectionLineComponent}
         onEdgeUpdate={onEdgeUpdate}
         onlyRenderVisibleElements={onlyRenderVisibleElements}
       />
diff --git a/src/container/ReactFlow/index.tsx b/src/container/ReactFlow/index.tsx
index 19a69b30..4a86fea8 100644
--- a/src/container/ReactFlow/index.tsx
+++ b/src/container/ReactFlow/index.tsx
@@ -131,7 +131,7 @@ const ReactFlow = ({
   onSelectionDrag,
   onSelectionDragStop,
   onSelectionContextMenu,
-  connectionMode,
+  connectionMode = ConnectionMode.Strict,
   connectionLineType = ConnectionLineType.Bezier,
   connectionLineStyle,
   connectionLineComponent,