diff --git a/packages/svelte/src/lib/components/Handle/Handle.svelte b/packages/svelte/src/lib/components/Handle/Handle.svelte
index 6238546d..d1ab49aa 100644
--- a/packages/svelte/src/lib/components/Handle/Handle.svelte
+++ b/packages/svelte/src/lib/components/Handle/Handle.svelte
@@ -79,7 +79,7 @@
   data-handleid={handleId}
   data-nodeid={nodeId}
   data-handlepos={position}
-  data-id="{nodeId}-{id}-{type}"
+  data-id="{nodeId}-{id || null}-{type}"
   class={cc([
     'svelte-flow__handle',
     `svelte-flow__handle-${position}`,
diff --git a/packages/svelte/src/lib/store/initial-store.ts b/packages/svelte/src/lib/store/initial-store.ts
index 1df46821..e329e2ea 100644
--- a/packages/svelte/src/lib/store/initial-store.ts
+++ b/packages/svelte/src/lib/store/initial-store.ts
@@ -73,7 +73,7 @@ export const getInitialStore = () => ({
   domNode: writable<HTMLDivElement | null>(null),
   connectionPath: readable<string | null>(null),
   connection: writable<ConnectionData>(initConnectionData),
-  connectionRadius: writable<number>(25),
+  connectionRadius: writable<number>(20),
   connectionLineType: writable<ConnectionLineType>(ConnectionLineType.Bezier),
   isValidConnection: writable<IsValidConnection>(() => true),
   nodesDraggable: writable<boolean>(true),