diff --git a/src/client.h b/src/client.h
index e7793402..29780e06 100755
--- a/src/client.h
+++ b/src/client.h
@@ -84,13 +84,13 @@
 // L:  number of samples per packet (SYSTEM_FRAME_SIZE_SAMPLES)
 // N:  number of bytes per packet (values below)
 #if ( SYSTEM_FRAME_SIZE_SAMPLES == 64 )
-# define OPUS_NUM_BYTES_MONO_LOW_QUALITY         12 // TODO to be adjusted, most probably higher value needed!
-# define OPUS_NUM_BYTES_MONO_NORMAL_QUALITY      22 // TODO to be adjusted, most probably higher value needed!
-# define OPUS_NUM_BYTES_MONO_HIGH_QUALITY        35 // TODO to be adjusted, most probably higher value needed!
+# define OPUS_NUM_BYTES_MONO_LOW_QUALITY         12
+# define OPUS_NUM_BYTES_MONO_NORMAL_QUALITY      22
+# define OPUS_NUM_BYTES_MONO_HIGH_QUALITY        35
 
-# define OPUS_NUM_BYTES_STEREO_LOW_QUALITY       43 // TODO to be adjusted, most probably higher value needed!
-# define OPUS_NUM_BYTES_STEREO_NORMAL_QUALITY    35 // TODO to be adjusted, most probably higher value needed!
-# define OPUS_NUM_BYTES_STEREO_HIGH_QUALITY      71 // TODO to be adjusted, most probably higher value needed!
+# define OPUS_NUM_BYTES_STEREO_LOW_QUALITY       24
+# define OPUS_NUM_BYTES_STEREO_NORMAL_QUALITY    35
+# define OPUS_NUM_BYTES_STEREO_HIGH_QUALITY      71
 #else
 # define OPUS_NUM_BYTES_MONO_LOW_QUALITY         25
 # define OPUS_NUM_BYTES_MONO_NORMAL_QUALITY      45