diff --git a/client/ui/services/settings.go b/client/ui/services/settings.go
index 6bcc8a21b..e8e57eb5b 100644
--- a/client/ui/services/settings.go
+++ b/client/ui/services/settings.go
@@ -222,9 +222,6 @@ func (s *Settings) GetRestrictions(ctx context.Context) (Restrictions, error) {
 			DisableNetworks:       featResp.GetDisableNetworks(),
 			DisableUpdateSettings: featResp.GetDisableUpdateSettings(),
 		},
-		MDM: MDMFields{
-			DisableAdvancedView: featResp.GetDisableAdvancedView(),
-		},
 	}
 	managed := cfgResp.GetMDMManagedFields()
 	if len(managed) > 0 {
@@ -238,6 +235,9 @@ func (s *Settings) GetRestrictions(ctx context.Context) (Restrictions, error) {
 			if v.Field(i).Kind() != reflect.Bool {
 				continue
 			}
+			if t.Field(i).Name == "DisableAdvancedView" {
+				continue
+			}
 			if _, ok := set[t.Field(i).Tag.Get("json")]; ok {
 				v.Field(i).SetBool(true)
 			}
@@ -250,5 +250,6 @@ func (s *Settings) GetRestrictions(ctx context.Context) (Restrictions, error) {
 			r.MDM.AllowServerSSH = &allowed
 		}
 	}
+	r.MDM.DisableAdvancedView = featResp.GetDisableAdvancedView()
 	return r, nil
 }