diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf0afb7..ac1e383 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Target Go 1.19 for Headscale [#778](https://github.com/juanfont/headscale/pull/778)
 - Target Tailscale v1.30.0 to build Headscale [#780](https://github.com/juanfont/headscale/pull/780)
 - Give a warning when running Headscale with reverse proxy improperly configured for WebSockets [#788](https://github.com/juanfont/headscale/pull/788)
+- Fix subnet routers with Primary Routes [#811](https://github.com/juanfont/headscale/pull/811)
 
 ## 0.16.4 (2022-08-21)
 
diff --git a/machine.go b/machine.go
index ad31c86..92d714e 100644
--- a/machine.go
+++ b/machine.go
@@ -642,6 +642,11 @@ func (machine Machine) toNode(
 
 	allowedIPs = append(allowedIPs, machine.EnabledRoutes...)
 
+	// TODO(kradalby): This is kind of a hack where we say that
+	// all the announced routes (except exit), is presented as primary
+	// routes. This might be problematic if two nodes expose the same route.
+	// This was added to address an issue where subnet routers stopped working
+	// when we only populated AllowedIPs.
 	primaryRoutes := []netip.Prefix{}
 	if len(machine.EnabledRoutes) > 0 {
 		for _, route := range machine.EnabledRoutes {