diff --git a/package.json b/package.json
index fd1ec9182f..8ef7cca7e2 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "angular2-grid": "2.0.6",
     "ansi_up": "^5.1.0",
     "applicationinsights": "1.0.8",
-    "azdataGraph": "github:Microsoft/azdataGraph#0.0.20",
+    "azdataGraph": "github:Microsoft/azdataGraph#0.0.21",
     "chart.js": "^2.9.4",
     "chokidar": "3.5.2",
     "graceful-fs": "4.2.6",
diff --git a/remote/package.json b/remote/package.json
index 302f059cd7..e1b901c17d 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -16,7 +16,7 @@
     "applicationinsights": "1.0.8",
     "angular2-grid": "2.0.6",
     "ansi_up": "^5.1.0",
-    "azdataGraph": "github:Microsoft/azdataGraph#0.0.20",
+    "azdataGraph": "github:Microsoft/azdataGraph#0.0.21",
     "chart.js": "^2.9.4",
     "chokidar": "3.5.2",
     "cookie": "^0.4.0",
diff --git a/remote/web/package.json b/remote/web/package.json
index 787d4d9dba..255dc44b69 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -15,7 +15,7 @@
 		"@vscode/vscode-languagedetection": "1.0.18",
 		"angular2-grid": "2.0.6",
 		"ansi_up": "^5.1.0",
-		"azdataGraph": "github:Microsoft/azdataGraph#0.0.20",
+		"azdataGraph": "github:Microsoft/azdataGraph#0.0.21",
 		"chart.js": "^2.9.4",
 		"gridstack": "^3.1.3",
 		"kburtram-query-plan": "2.6.1",
diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock
index 137d281e0c..44686c48af 100644
--- a/remote/web/yarn.lock
+++ b/remote/web/yarn.lock
@@ -150,9 +150,9 @@ array-uniq@^1.0.2:
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
   integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
-"azdataGraph@github:Microsoft/azdataGraph#0.0.20":
-  version "0.0.20"
-  resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/d685f37f72f0b22c42d15fbb725b3a5a5b3d71ae"
+"azdataGraph@github:Microsoft/azdataGraph#0.0.21":
+  version "0.0.21"
+  resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/59f38fc96ab8beadb5ed2b6986ae3f39d662d040"
 
 chalk@^2.3.0, chalk@^2.4.1:
   version "2.4.2"
diff --git a/remote/yarn.lock b/remote/yarn.lock
index 6c0b54c137..9d816962dc 100644
--- a/remote/yarn.lock
+++ b/remote/yarn.lock
@@ -198,9 +198,9 @@ array-uniq@^1.0.2:
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
   integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
-"azdataGraph@github:Microsoft/azdataGraph#0.0.20":
-  version "0.0.20"
-  resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/d685f37f72f0b22c42d15fbb725b3a5a5b3d71ae"
+"azdataGraph@github:Microsoft/azdataGraph#0.0.21":
+  version "0.0.21"
+  resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/59f38fc96ab8beadb5ed2b6986ae3f39d662d040"
 
 binary-extensions@^2.0.0:
   version "2.0.0"
diff --git a/src/sql/workbench/contrib/executionPlan/browser/azdataGraphView.ts b/src/sql/workbench/contrib/executionPlan/browser/azdataGraphView.ts
index 0fc62004f9..ffcad23a23 100644
--- a/src/sql/workbench/contrib/executionPlan/browser/azdataGraphView.ts
+++ b/src/sql/workbench/contrib/executionPlan/browser/azdataGraphView.ts
@@ -111,7 +111,7 @@ export class AzdataGraphView {
 	 * Zooms in to the diagram.
 	 */
 	public zoomIn(): void {
-		this._diagram.graph.zoomIn();
+		this._diagram.zoomIn();
 	}
 
 
@@ -119,16 +119,14 @@ export class AzdataGraphView {
 	 * Zooms out of the diagram
 	 */
 	public zoomOut(): void {
-		this._diagram.graph.zoomOut();
+		this._diagram.zoomOut();
 	}
 
 	/**
 	 * Fits the diagram into the parent container size.
 	 */
 	public zoomToFit(): void {
-		this._diagram.graph.fit();
-		this._diagram.graph.view.rendering = true;
-		this._diagram.graph.view.refresh();
+		this._diagram.zoomToFit();
 	}
 
 	/**
@@ -146,7 +144,7 @@ export class AzdataGraphView {
 		if (level < 1) {
 			throw new Error(localize('invalidExecutionPlanZoomError', "Zoom level cannot be 0 or negative"));
 		}
-		this._diagram.graph.view.setScale(level / 100);
+		this._diagram.zoomTo(level);
 	}
 
 	/**
diff --git a/yarn.lock b/yarn.lock
index 5e9c042b73..78469d4677 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1831,9 +1831,9 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
-"azdataGraph@github:Microsoft/azdataGraph#0.0.20":
-  version "0.0.20"
-  resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/d685f37f72f0b22c42d15fbb725b3a5a5b3d71ae"
+"azdataGraph@github:Microsoft/azdataGraph#0.0.21":
+  version "0.0.21"
+  resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/59f38fc96ab8beadb5ed2b6986ae3f39d662d040"
 
 azure-storage@^2.10.2:
   version "2.10.2"