diff --git a/components/raop/dmap_parser.c b/components/raop/dmap_parser.c
index 4f683066..67e43e8b 100644
--- a/components/raop/dmap_parser.c
+++ b/components/raop/dmap_parser.c
@@ -7,8 +7,6 @@
 #define DMAP_STRINGIFY_(x) #x
 #define DMAP_STRINGIFY(x) DMAP_STRINGIFY_(x)
 
-#define DMAP_FULL 1
-
 typedef enum {
 	DMAP_UNKNOWN,
 	DMAP_UINT,
diff --git a/components/squeezelite/opus.c b/components/squeezelite/opus.c
index 368efe59..6280332f 100644
--- a/components/squeezelite/opus.c
+++ b/components/squeezelite/opus.c
@@ -152,9 +152,9 @@ static int get_opus_packet(void) {
 		if (status)	OG(&go, stream_pagein, &u->state, &u->page);
 	} 
     
-    // only return a negative value when end of streaming is reached
+    // only return a negative value when true end of streaming is reached
     if (status > 0) packet = status;
-    else if (stream.state > DISCONNECT) packet = 0;
+    else if (stream.state > DISCONNECT || _buf_used(streambuf)) packet = 0;
 
 	UNLOCK_S;
 	return packet;
diff --git a/components/squeezelite/vorbis.c b/components/squeezelite/vorbis.c
index db2e0cbb..a5f9d47e 100644
--- a/components/squeezelite/vorbis.c
+++ b/components/squeezelite/vorbis.c
@@ -152,9 +152,9 @@ static int get_ogg_packet(void) {
 		if (status)	OG(&go, stream_pagein, &v->state, &v->page);
 	}
     
-    // only return a negative value when end of streaming is reached
+    // only return a negative value when true end of streaming is reached
     if (status > 0) packet = status;
-    else if (stream.state > DISCONNECT) packet = 0;
+    else if (stream.state > DISCONNECT || _buf_used(streambuf)) packet = 0;
 
 	UNLOCK_S;
 	return packet;