diff --git a/main/codec_builtin.c b/main/codec_builtin.c
index 80db1eb20b..02c9f2e79a 100644
--- a/main/codec_builtin.c
+++ b/main/codec_builtin.c
@@ -147,7 +147,7 @@ static struct ast_codec none = {
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 8000, /* This must have some sample rate to prevent divide by 0 */
 	.minimum_ms = 10,
-	.maximum_ms = 150,
+	.maximum_ms = 140,
 	.default_ms = 20,
 	.minimum_bytes = 20,
 	.samples_count = none_samples,
@@ -170,7 +170,7 @@ static struct ast_codec ulaw = {
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 8000,
 	.minimum_ms = 10,
-	.maximum_ms = 150,
+	.maximum_ms = 140,
 	.default_ms = 20,
 	.minimum_bytes = 80,
 	.samples_count = ulaw_samples,
@@ -185,7 +185,7 @@ static struct ast_codec alaw = {
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 8000,
 	.minimum_ms = 10,
-	.maximum_ms = 150,
+	.maximum_ms = 140,
 	.default_ms = 20,
 	.minimum_bytes = 80,
 	.samples_count = ulaw_samples,
@@ -290,7 +290,7 @@ static struct ast_codec slin8 = {
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 8000,
 	.minimum_ms = 10,
-	.maximum_ms = 70,
+	.maximum_ms = 60,
 	.default_ms = 20,
 	.minimum_bytes = 160,
 	.samples_count = slin_samples,
@@ -306,7 +306,7 @@ static struct ast_codec slin12 = {
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 12000,
 	.minimum_ms = 10,
-	.maximum_ms = 70,
+	.maximum_ms = 60,
 	.default_ms = 20,
 	.minimum_bytes = 240,
 	.samples_count = slin_samples,
@@ -322,7 +322,7 @@ static struct ast_codec slin16 = {
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 16000,
 	.minimum_ms = 10,
-	.maximum_ms = 70,
+	.maximum_ms = 60,
 	.default_ms = 20,
 	.minimum_bytes = 320,
 	.samples_count = slin_samples,
@@ -338,7 +338,7 @@ static struct ast_codec slin24 = {
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 24000,
 	.minimum_ms = 10,
-	.maximum_ms = 70,
+	.maximum_ms = 60,
 	.default_ms = 20,
 	.minimum_bytes = 480,
 	.samples_count = slin_samples,
@@ -354,7 +354,7 @@ static struct ast_codec slin32 = {
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 32000,
 	.minimum_ms = 10,
-	.maximum_ms = 70,
+	.maximum_ms = 60,
 	.default_ms = 20,
 	.minimum_bytes = 640,
 	.samples_count = slin_samples,
@@ -370,7 +370,7 @@ static struct ast_codec slin44 = {
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 44100,
 	.minimum_ms = 10,
-	.maximum_ms = 70,
+	.maximum_ms = 60,
 	.default_ms = 20,
 	.minimum_bytes = 882,
 	.samples_count = slin_samples,
@@ -386,7 +386,7 @@ static struct ast_codec slin48 = {
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 48000,
 	.minimum_ms = 10,
-	.maximum_ms = 70,
+	.maximum_ms = 60,
 	.default_ms = 20,
 	.minimum_bytes = 960,
 	.samples_count = slin_samples,
@@ -402,7 +402,7 @@ static struct ast_codec slin96 = {
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 96000,
 	.minimum_ms = 10,
-	.maximum_ms = 70,
+	.maximum_ms = 60,
 	.default_ms = 20,
 	.minimum_bytes = 1920,
 	.samples_count = slin_samples,
@@ -418,7 +418,7 @@ static struct ast_codec slin192 = {
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 192000,
 	.minimum_ms = 10,
-	.maximum_ms = 70,
+	.maximum_ms = 60,
 	.default_ms = 20,
 	.minimum_bytes = 3840,
 	.samples_count = slin_samples,
@@ -468,7 +468,7 @@ static struct ast_codec g729a = {
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 8000,
 	.minimum_ms = 10,
-	.maximum_ms = 230,
+	.maximum_ms = 220,
 	.default_ms = 20,
 	.minimum_bytes = 10,
 	.samples_count = g729_samples,
@@ -671,7 +671,7 @@ static struct ast_codec g722 = {
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 16000,
 	.minimum_ms = 10,
-	.maximum_ms = 150,
+	.maximum_ms = 140,
 	.default_ms = 20,
 	.minimum_bytes = 80,
 	.samples_count = g726_samples,