diff --git a/management/server/policy.go b/management/server/policy.go
index cf695e5e2..055542430 100644
--- a/management/server/policy.go
+++ b/management/server/policy.go
@@ -461,15 +461,14 @@ func (am *DefaultAccountManager) savePolicy(account *Account, policyToSave *Poli
 		}
 
 		oldPolicy := account.Policies[policyIdx]
+		// Update the existing policy
+		account.Policies[policyIdx] = policyToSave
+
 		if !policyToSave.Enabled && !oldPolicy.Enabled {
 			return false, nil
 		}
-
 		updateAccountPeers := anyGroupHasPeers(account, oldPolicy.ruleGroups()) || anyGroupHasPeers(account, policyToSave.ruleGroups())
 
-		// Update the existing policy
-		account.Policies[policyIdx] = policyToSave
-
 		return updateAccountPeers, nil
 	}