diff --git a/CHANGELOG.md b/CHANGELOG.md
index da06f3a8e..0625d4045 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ CHANGE: auto-update the ziti CLI version that is built in to the openziti/zrok c
 
 CHANGE: Docker examples set HOME to enable running CLI commands in the container
 
+FIX: Fix for environment count inheritance when using a resource count class to override global environment count (https://github.com/openziti/zrok/issues/695)
+
 ## v0.4.34
 
 FEATURE: Linux service support for all private share modes (contribution from Stefan Adelbert @stefanadelbert)
diff --git a/controller/limits/agent.go b/controller/limits/agent.go
index af19aa2ea..4bcf251da 100644
--- a/controller/limits/agent.go
+++ b/controller/limits/agent.go
@@ -68,7 +68,7 @@ func (a *Agent) CanCreateEnvironment(acctId int, trx *sqlx.Tx) (bool, error) {
 			if err != nil {
 				return false, err
 			}
-			if len(envs)+1 > a.cfg.Environments {
+			if len(envs)+1 > ul.resource.GetEnvironments() {
 				return false, nil
 			}
 		}