diff --git a/src/common/OrgChangeNotifier.ts b/src/common/OrgChangeNotifier.ts
index 26c1cfd7..5f09a7fc 100644
--- a/src/common/OrgChangeNotifier.ts
+++ b/src/common/OrgChangeNotifier.ts
@@ -51,6 +51,9 @@ export class OrgChangeNotifier {
         const pacActiveOrg = await this._pacWrapper?.activeOrg();
         if (pacActiveOrg && pacActiveOrg.Status === PAC_SUCCESS) {
             this._orgDetails = pacActiveOrg.Results;
+
+            await this.extensionContext.globalState.update('orgID', this._orgDetails.OrgId);
+
             orgChangeEventEmitter.fire(this._orgDetails);
         } else {
             orgChangeErrorEventEmitter.fire();