diff --git a/influxdb/1.7/init-influxdb.sh b/influxdb/1.7/init-influxdb.sh
index 3f7349a08..ef99ab1e0 100755
--- a/influxdb/1.7/init-influxdb.sh
+++ b/influxdb/1.7/init-influxdb.sh
@@ -22,7 +22,7 @@ fi
 if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d "$META_DIR" 2>/dev/null)" ]; then
 
 	INIT_QUERY=""
-	CREATE_DB_QUERY="CREATE DATABASE $INFLUXDB_DB"
+	CREATE_DB_QUERY="CREATE DATABASE \"$INFLUXDB_DB\""
 
 	if [ ! -z "$INIT_USERS" ]; then
 
diff --git a/influxdb/1.8/init-influxdb.sh b/influxdb/1.8/init-influxdb.sh
index 3f7349a08..ef99ab1e0 100755
--- a/influxdb/1.8/init-influxdb.sh
+++ b/influxdb/1.8/init-influxdb.sh
@@ -22,7 +22,7 @@ fi
 if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d "$META_DIR" 2>/dev/null)" ]; then
 
 	INIT_QUERY=""
-	CREATE_DB_QUERY="CREATE DATABASE $INFLUXDB_DB"
+	CREATE_DB_QUERY="CREATE DATABASE \"$INFLUXDB_DB\""
 
 	if [ ! -z "$INIT_USERS" ]; then