diff --git a/toxav/codec.c b/toxav/codec.c
index f3d24969f..9ca9a50cb 100644
--- a/toxav/codec.c
+++ b/toxav/codec.c
@@ -36,8 +36,8 @@
 #include "rtp.h"
 #include "codec.h"
 
-const uint16_t min_jbuf_size = 10;
-const uint16_t min_readiness_idx = 6; /* when is buffer ready to dqq */
+const uint16_t min_jbuf_size = 4;
+const uint16_t min_readiness_idx = 2; /* when is buffer ready to dqq */
 
 int empty_queue(JitterBuffer *q)
 {
diff --git a/toxav/toxav.c b/toxav/toxav.c
index dcab06d05..ab5fe6114 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -77,7 +77,7 @@ struct _ToxAv {
 };
 
 const ToxAvCodecSettings av_DefaultSettings = {
-    2000,
+    500,
     800,
     600,
 
@@ -87,7 +87,7 @@ const ToxAvCodecSettings av_DefaultSettings = {
     1,
     600,
 
-    10
+    6
 };