diff --git a/package.json b/package.json
index 9d18181..9edf02c 100644
--- a/package.json
+++ b/package.json
@@ -12493,7 +12493,7 @@
 		"vscode:prepublish": "yarn run bundle"
 	},
 	"dependencies": {
-		"@gitkraken/gitkraken-components": "1.0.0-rc.24",
+		"@gitkraken/gitkraken-components": "1.0.0-rc.26",
 		"@microsoft/fast-element": "1.10.5",
 		"@microsoft/fast-react-wrapper": "0.3.14",
 		"@octokit/core": "4.0.5",
diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts
index da55a06..901d727 100644
--- a/src/env/node/git/localGitProvider.ts
+++ b/src/env/node/git/localGitProvider.ts
@@ -1866,7 +1866,10 @@ export class LocalGitProvider implements GitProvider, Disposable {
 						const groupedRefs: GitReference[] = [];
 						for (const refRemoteHead of refRemoteHeads) {
 							if (refRemoteHead.name == tip && refRemoteHead.context) {
-								const ref = JSON.parse(refRemoteHead.context)?.webviewItemValue?.ref;
+								const refContext = typeof refRemoteHead.context === 'string'
+									? JSON.parse(refRemoteHead.context)
+									: refRemoteHead.context;
+								const ref = refContext?.webviewItemValue?.ref;
 								if (ref) {
 									groupedRefs.push(ref);
 								}
diff --git a/yarn.lock b/yarn.lock
index 5504d7b..abf2cc8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -85,10 +85,10 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@gitkraken/gitkraken-components@1.0.0-rc.24":
-  version "1.0.0-rc.24"
-  resolved "https://registry.yarnpkg.com/@gitkraken/gitkraken-components/-/gitkraken-components-1.0.0-rc.24.tgz#6d8a3b63c20640acb38135d2a041d2e45b7f2d82"
-  integrity sha512-LV5t4TPdzPB5i19M2JSlOBh3pgaHJzVZJV+zm2uwDMdZKUvwZMcMT9m+zItn+Cqg2m7YBgfclfLWFL85KbMUow==
+"@gitkraken/gitkraken-components@1.0.0-rc.26":
+  version "1.0.0-rc.26"
+  resolved "https://registry.yarnpkg.com/@gitkraken/gitkraken-components/-/gitkraken-components-1.0.0-rc.26.tgz#a562c6b77ca393c4728c558e3f82fae87efb14a7"
+  integrity sha512-y/7ltqW173P+fcPNkFWsSkL63R/RwyXAk6OKhi2EERML5DxwnsOvKwqzOIUHOlwNo7kNq+4s8DIfrfZDW9oFDw==
   dependencies:
     "@axosoft/react-virtualized" "9.22.3-gitkraken.3"
     classnames "2.2.3"