diff --git a/limelight-common/AudioStream.c b/limelight-common/AudioStream.c
index 646cbb1..7785cb3 100644
--- a/limelight-common/AudioStream.c
+++ b/limelight-common/AudioStream.c
@@ -18,7 +18,11 @@ static unsigned short lastSeq;
 #define RTP_PORT 48000
 
 #define MAX_PACKET_SIZE 100
-#define RTP_RECV_BUFFER 12 * MAX_PACKET_SIZE
+
+// This is much larger than we should typically have buffered, but
+// it needs to be. We need a cushion in case our thread gets blocked
+// for longer than normal.
+#define RTP_RECV_BUFFER (64 * MAX_PACKET_SIZE)
 
 typedef struct _QUEUED_AUDIO_PACKET {
 	// data must remain at the front
diff --git a/limelight-common/VideoStream.c b/limelight-common/VideoStream.c
index eb6149d..5dbabc7 100644
--- a/limelight-common/VideoStream.c
+++ b/limelight-common/VideoStream.c
@@ -9,7 +9,7 @@
 #define RTP_PORT 47998
 #define FIRST_FRAME_PORT 47996
 
-#define RTP_RECV_BUFFER 64 * 1024
+#define RTP_RECV_BUFFER (64 * 1024)
 
 static RTP_REORDER_QUEUE rtpQueue;