diff --git a/core/unifi/usw_influx.go b/core/unifi/usw_influx.go
index 01744d4b..0797783a 100644
--- a/core/unifi/usw_influx.go
+++ b/core/unifi/usw_influx.go
@@ -84,7 +84,6 @@ func (u *USW) PointsAt(now time.Time) ([]*influx.Point, error) {
 		"stat_tx_packets":     u.Stat.TxPackets.Val,
 		"stat_tx_retries":     u.Stat.TxRetries.Val,
 		"uplink_depth":        u.UplinkDepth.Txt,
-		// Add the port stats too.
 	}
 	pt, err := influx.NewPoint("usw", tags, fields, now)
 	if err != nil {
diff --git a/core/unifi/usw_type.go b/core/unifi/usw_type.go
index 90a2848e..a6c94d25 100644
--- a/core/unifi/usw_type.go
+++ b/core/unifi/usw_type.go
@@ -62,9 +62,9 @@ type USW struct {
 	DeviceID              string      `json:"device_id"`
 	State                 FlexInt     `json:"state"`
 	LastSeen              FlexInt     `json:"last_seen"`
-	Upgradable            FlexBool    `json:"upgradable"`
-	AdoptableWhenUpgraded FlexBool    `json:"adoptable_when_upgraded"`
-	Rollupgrade           FlexBool    `json:"rollupgrade"`
+	Upgradable            FlexBool    `json:"upgradable,omitempty"`
+	AdoptableWhenUpgraded FlexBool    `json:"adoptable_when_upgraded,omitempty"`
+	Rollupgrade           FlexBool    `json:"rollupgrade,omitempty"`
 	KnownCfgversion       string      `json:"known_cfgversion"`
 	Uptime                FlexInt     `json:"uptime"`
 	Locating              FlexBool    `json:"locating"`