diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2289fd18331..acb0fd266d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 1. [19043](https://github.com/influxdata/influxdb/pull/19043): Enforce all influx CLI flag args are valid
 1. [19188](https://github.com/influxdata/influxdb/pull/19188): Dashboard cells correctly map results when multiple queries exist
 1. [19146](https://github.com/influxdata/influxdb/pull/19146): Dashboard cells and overlay use UTC as query time when toggling to UTC timezone
+1. [19222](https://github.com/influxdata/influxdb/pull/19222): Bucket names may not include quotation marks
 
 ## v2.0.0-beta.15 [2020-07-23]
 
diff --git a/tenant/http_server_bucket.go b/tenant/http_server_bucket.go
index 5fdb1811d30..e148b602136 100644
--- a/tenant/http_server_bucket.go
+++ b/tenant/http_server_bucket.go
@@ -498,5 +498,13 @@ func validBucketName(bucket *influxdb.Bucket) error {
 			Msg:  fmt.Sprintf("bucket name %s is invalid. Buckets may not start with underscore", bucket.Name),
 		}
 	}
+	// quotation marks will cause queries to fail
+	if strings.Contains(bucket.Name, "\"") {
+		return &influxdb.Error{
+			Code: influxdb.EInvalid,
+			Op:   "http/bucket",
+			Msg:  fmt.Sprintf("bucket name %s is invalid. Bucket names may not include quotation marks", bucket.Name),
+		}
+	}
 	return nil
 }