diff --git a/public/app/features/variables/state/actions.ts b/public/app/features/variables/state/actions.ts
index 5fe5c51dd01..594d6addf75 100644
--- a/public/app/features/variables/state/actions.ts
+++ b/public/app/features/variables/state/actions.ts
@@ -97,7 +97,7 @@ export const completeDashboardTemplating = (dashboard: DashboardModel): ThunkRes
     templateSrv.setGlobalVariable('__org', {
       value: {
         name: contextSrv.user.orgName,
-        id: contextSrv.user.id,
+        id: contextSrv.user.orgId,
         toString: function() {
           return this.id;
         },