diff --git a/outputs/influxdb/influxdb.go b/outputs/influxdb/influxdb.go
index 983fcc6ee987c..7d3f95d1e5d2e 100644
--- a/outputs/influxdb/influxdb.go
+++ b/outputs/influxdb/influxdb.go
@@ -97,10 +97,10 @@ func (i *InfluxDB) Connect() error {
 
 			// Create Database if it doesn't exist
 			_, e := c.Query(client.Query{
-				Command: fmt.Sprintf("CREATE DATABASE %s", i.Database),
+				Command: fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s", i.Database),
 			})
 
-			if e != nil && !strings.Contains(e.Error(), "database already exists") {
+			if e != nil {
 				log.Println("Database creation failed: " + e.Error())
 			}