diff --git a/controller/environmentDetail.go b/controller/environmentDetail.go
index f6e52270..4a85dbab 100644
--- a/controller/environmentDetail.go
+++ b/controller/environmentDetail.go
@@ -70,6 +70,7 @@ func (h *environmentDetailHandler) Handle(params metadata.GetEnvironmentDetailPa
 		es.Shares = append(es.Shares, &rest_model_zrok.Share{
 			ShareToken:           shr.Token,
 			ZID:                  shr.ZId,
+			EnvZID:               senv.ZId,
 			ShareMode:            shr.ShareMode,
 			BackendMode:          shr.BackendMode,
 			FrontendSelection:    feSelection,
diff --git a/controller/orgAccountOverview.go b/controller/orgAccountOverview.go
index d5d27e96..ef8eef5b 100644
--- a/controller/orgAccountOverview.go
+++ b/controller/orgAccountOverview.go
@@ -101,6 +101,7 @@ func (h *orgAccountOverviewHandler) Handle(params metadata.OrgAccountOverviewPar
 			envShr := &rest_model_zrok.Share{
 				ShareToken:           shr.Token,
 				ZID:                  shr.ZId,
+				EnvZID:               env.ZId,
 				ShareMode:            shr.ShareMode,
 				BackendMode:          shr.BackendMode,
 				FrontendSelection:    feSelection,
diff --git a/controller/overview.go b/controller/overview.go
index f23b95d1..ec339e52 100644
--- a/controller/overview.go
+++ b/controller/overview.go
@@ -76,6 +76,7 @@ func (h *overviewHandler) Handle(_ metadata.OverviewParams, principal *rest_mode
 			envShr := &rest_model_zrok.Share{
 				ShareToken:           shr.Token,
 				ZID:                  shr.ZId,
+				EnvZID:               env.ZId,
 				ShareMode:            shr.ShareMode,
 				BackendMode:          shr.BackendMode,
 				FrontendSelection:    feSelection,
diff --git a/controller/shareDetail.go b/controller/shareDetail.go
index 94fde868..279c7fc5 100644
--- a/controller/shareDetail.go
+++ b/controller/shareDetail.go
@@ -32,8 +32,10 @@ func (h *shareDetailHandler) Handle(params metadata.GetShareDetailParams, princi
 		return metadata.NewGetShareDetailInternalServerError()
 	}
 	found := false
+	var shrEnv *store.Environment
 	for _, env := range envs {
 		if shr.EnvironmentId == env.Id {
+			shrEnv = env
 			found = true
 			break
 		}
@@ -71,6 +73,7 @@ func (h *shareDetailHandler) Handle(params metadata.GetShareDetailParams, princi
 	return metadata.NewGetShareDetailOK().WithPayload(&rest_model_zrok.Share{
 		ShareToken:           shr.Token,
 		ZID:                  shr.ZId,
+		EnvZID:               shrEnv.ZId,
 		ShareMode:            shr.ShareMode,
 		BackendMode:          shr.BackendMode,
 		FrontendSelection:    feSelection,