diff --git a/components/canvas/canvas.tsx b/components/canvas/canvas.tsx
index c5efbc8..e74f99a 100644
--- a/components/canvas/canvas.tsx
+++ b/components/canvas/canvas.tsx
@@ -489,7 +489,7 @@ function CanvasInner({ canvasId }: CanvasInnerProps) {
       _id: tempEdgeId,
       _creationTime: Date.now(),
       canvasId: args.canvasId,
-      sourceNodeId: args.sourceNodeId,
+      sourceNodeId: args.sourceNodeId as Id<"nodes">,
       targetNodeId: tempNodeId,
       sourceHandle: args.sourceHandle,
       targetHandle: args.targetHandle,
@@ -549,7 +549,7 @@ function CanvasInner({ canvasId }: CanvasInnerProps) {
       _creationTime: Date.now(),
       canvasId: args.canvasId,
       sourceNodeId: tempNodeId,
-      targetNodeId: args.targetNodeId,
+      targetNodeId: args.targetNodeId as Id<"nodes">,
       sourceHandle: args.sourceHandle,
       targetHandle: args.targetHandle,
     };
@@ -701,8 +701,8 @@ function CanvasInner({ canvasId }: CanvasInnerProps) {
 
   const addOptimisticEdgeLocally = useCallback((args: {
     clientRequestId: string;
-    sourceNodeId: Id<"nodes">;
-    targetNodeId: Id<"nodes">;
+    sourceNodeId: string;
+    targetNodeId: string;
     sourceHandle?: string;
     targetHandle?: string;
   }): Id<"edges"> => {
diff --git a/lib/canvas-op-queue.ts b/lib/canvas-op-queue.ts
index bab6882..70d0397 100644
--- a/lib/canvas-op-queue.ts
+++ b/lib/canvas-op-queue.ts
@@ -30,7 +30,7 @@ export type CanvasSyncOpPayloadByType = {
     parentId?: Id<"nodes">;
     zIndex?: number;
     clientRequestId: string;
-    sourceNodeId: Id<"nodes">;
+    sourceNodeId: string;
     sourceHandle?: string;
     targetHandle?: string;
   };
@@ -45,7 +45,7 @@ export type CanvasSyncOpPayloadByType = {
     parentId?: Id<"nodes">;
     zIndex?: number;
     clientRequestId: string;
-    targetNodeId: Id<"nodes">;
+    targetNodeId: string;
     sourceHandle?: string;
     targetHandle?: string;
   };
@@ -334,7 +334,7 @@ function normalizeOp(raw: unknown): CanvasSyncOp | null {
             : undefined,
         zIndex: typeof payload.zIndex === "number" ? payload.zIndex : undefined,
         clientRequestId: payload.clientRequestId,
-        sourceNodeId: payload.sourceNodeId as Id<"nodes">,
+        sourceNodeId: payload.sourceNodeId,
         sourceHandle:
           typeof payload.sourceHandle === "string"
             ? payload.sourceHandle
@@ -381,7 +381,7 @@ function normalizeOp(raw: unknown): CanvasSyncOp | null {
             : undefined,
         zIndex: typeof payload.zIndex === "number" ? payload.zIndex : undefined,
         clientRequestId: payload.clientRequestId,
-        targetNodeId: payload.targetNodeId as Id<"nodes">,
+        targetNodeId: payload.targetNodeId,
         sourceHandle:
           typeof payload.sourceHandle === "string"
             ? payload.sourceHandle
@@ -834,7 +834,7 @@ function remapNodeIdInPayload(
       changed = true;
     }
     if (next.sourceNodeId === fromNodeId) {
-      next.sourceNodeId = toNodeId as Id<"nodes">;
+      next.sourceNodeId = toNodeId;
       changed = true;
     }
     if (changed) {
@@ -849,7 +849,7 @@ function remapNodeIdInPayload(
       changed = true;
     }
     if (next.targetNodeId === fromNodeId) {
-      next.targetNodeId = toNodeId as Id<"nodes">;
+      next.targetNodeId = toNodeId;
       changed = true;
     }
     if (changed) {