diff --git a/database/influxdb/node.go b/database/influxdb/node.go
index eb13f4b4..07d3fcf1 100644
--- a/database/influxdb/node.go
+++ b/database/influxdb/node.go
@@ -173,7 +173,9 @@ func (conn *Connection) InsertNode(node *runtime.Node) {
 		fields["airtime"+suffix+".frequency"] = airtime.Frequency
 		tags.SetString("frequency"+suffix, strconv.Itoa(int(airtime.Frequency)))
 	}
-
+	// Add selected gateway mac as tag
+	tags.SetString("gateway", stats.GatewayIPv4)
+	tags.SetString("gateway6", stats.GatewayIPv6)
 	conn.addPoint(MeasurementNode, tags, fields, time)
 
 	// Add DHCP statistics