diff --git a/client/internal/profilemanager/config.go b/client/internal/profilemanager/config.go
index 3ee2972bb..68611aa57 100644
--- a/client/internal/profilemanager/config.go
+++ b/client/internal/profilemanager/config.go
@@ -89,13 +89,14 @@ type ConfigInput struct {
 	ClientCertPath                string
 	ClientCertKeyPath             string
 
-	DisableClientRoutes *bool
-	DisableServerRoutes *bool
-	DisableDNS          *bool
-	DisableFirewall     *bool
-	BlockLANAccess      *bool
-	BlockInbound        *bool
-	DisableIPv6         *bool
+	DisableClientRoutes        *bool
+	DisableServerRoutes        *bool
+	DisableDNS                 *bool
+	DisableFirewall            *bool
+	BlockLANAccess             *bool
+	BlockInbound               *bool
+	DisableIPv6                *bool
+	DisableComponentNetworkMap *bool
 
 	DisableNotifications *bool
 
@@ -588,6 +589,12 @@ func (config *Config) apply(input ConfigInput) (updated bool, err error) {
 		updated = true
 	}
 
+	if input.DisableComponentNetworkMap != nil && *input.DisableComponentNetworkMap != config.DisableComponentNetworkMap {
+		log.Infof("setting ComponentNetworkMap disabled=%v", *input.DisableComponentNetworkMap)
+		config.DisableComponentNetworkMap = *input.DisableComponentNetworkMap
+		updated = true
+	}
+
 	if input.DisableNotifications != nil && (config.DisableNotifications == nil || *input.DisableNotifications != *config.DisableNotifications) {
 		if *input.DisableNotifications {
 			log.Infof("disabling notifications")