diff --git a/common/persistence/persistence-factory/factory.go b/common/persistence/persistence-factory/factory.go
index aed66fed78c..c8b4e32faa2 100644
--- a/common/persistence/persistence-factory/factory.go
+++ b/common/persistence/persistence-factory/factory.go
@@ -299,7 +299,7 @@ func buildRatelimiters(cfg *config.Persistence) map[string]common.TokenBucket {
 			qps = ds.SQL.MaxQPS
 		}
 		if qps > 0 {
-			result[dsName] = common.NewTokenBucket(ds.Cassandra.MaxQPS, common.NewRealTimeSource())
+			result[dsName] = common.NewTokenBucket(qps, common.NewRealTimeSource())
 		}
 	}
 	return result
diff --git a/schema/mysql/v57/cadence/schema.sql b/schema/mysql/v57/cadence/schema.sql
index 27813286096..ea7a8f97ba2 100644
--- a/schema/mysql/v57/cadence/schema.sql
+++ b/schema/mysql/v57/cadence/schema.sql
@@ -237,7 +237,7 @@ task_list                   VARCHAR(255) NOT NULL,
 started_identity            VARCHAR(255) NOT NULL,
 has_retry_policy            BOOLEAN NOT NULL,
 init_interval               INT NOT NULL,
-backoff_coefficient         DOUBLE NOT NULL,
+backoff_coefficient         DOUBLE,
 max_interval                INT NOT NULL,
 expiration_time             TIMESTAMP(3) NOT NULL DEFAULT '1970-01-01 00:00:01.000',
 max_attempts                INT NOT NULL,