diff --git a/monitoring/monitoring_server/src/asapo_monitoring_server/main/main.go b/monitoring/monitoring_server/src/asapo_monitoring_server/main/main.go
index fec5bc505498518250d0cb5219af0a940b07fa45..1033d285e2065993603169f3317f9f7ae12dd4ed 100644
--- a/monitoring/monitoring_server/src/asapo_monitoring_server/main/main.go
+++ b/monitoring/monitoring_server/src/asapo_monitoring_server/main/main.go
@@ -78,10 +78,11 @@ func main() {
 
 	// InfluxDB 1 fix, create database
 	data := url.Values{}
-	data.Set("q", "CREATE DATABASE " + settings.InfluxDbDatabase)
+	data.Set("q", "CREATE DATABASE "+settings.InfluxDbDatabase)
+	data.Set("q", "CREATE DATABASE "+settings.InfluxDbDatabase+"_avg") //TODO ???
 
 	res, err := http.Post(
-		settings.InfluxDbUrl + "/query", "application/x-www-form-urlencoded",
+		settings.InfluxDbUrl+"/query", "application/x-www-form-urlencoded",
 		strings.NewReader(data.Encode()))
 
 	if err != nil {
diff --git a/monitoring/monitoring_server/src/asapo_monitoring_server/server/Settings.go b/monitoring/monitoring_server/src/asapo_monitoring_server/server/Settings.go
index cdabee52a65947a043db42e7e36ffb677d8a437c..2f2b0b9fa763ae62ac590f7cd18b4fb487713920 100644
--- a/monitoring/monitoring_server/src/asapo_monitoring_server/server/Settings.go
+++ b/monitoring/monitoring_server/src/asapo_monitoring_server/server/Settings.go
@@ -33,6 +33,7 @@ const (
 	dbMeasurementFtsTransfers = "ftsTransfers"
 
 	// Used to get a corresponding bucket with averaged data
+	// DO NOT CHANGE
 	averageSuffix = "_avg"
 )