diff --git a/packages/react-diagrams-core/src/entities/link/LinkModel.ts b/packages/react-diagrams-core/src/entities/link/LinkModel.ts
index 28ff867..b0f7107 100644
--- a/packages/react-diagrams-core/src/entities/link/LinkModel.ts
+++ b/packages/react-diagrams-core/src/entities/link/LinkModel.ts
@@ -163,9 +163,11 @@ export class LinkModel<G extends LinkModelGenerics = LinkModelGenerics>
 	remove() {
 		if (this.sourcePort) {
 			this.sourcePort.removeLink(this);
+			delete sourcePort;
 		}
 		if (this.targetPort) {
 			this.targetPort.removeLink(this);
+			delete targetPort;
 		}
 		super.remove();
 	}
@@ -277,6 +279,7 @@ export class LinkModel<G extends LinkModelGenerics = LinkModelGenerics>
 	}
 
 	removePoint(pointModel: PointModel) {
+		if (this.isLastPoint(pointModel)) this.remove();
 		this.points.splice(this.getPointIndex(pointModel), 1);
 	}