diff --git a/NEWS b/NEWS
index 08057a86e..ec6cbe663 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 ver 0.15.5 (2009/??/??)
 * input:
   - curl: don't abort if a packet has only metadata
+  - curl: fixed endless loop during buffering
 * tags:
   - riff, aiff: fixed "limited range" gcc warning
 * decoder_thread: change the fallback decoder name to "mad"
diff --git a/src/input/curl_input_plugin.c b/src/input/curl_input_plugin.c
index b83bcd918..95d269ce5 100644
--- a/src/input/curl_input_plugin.c
+++ b/src/input/curl_input_plugin.c
@@ -315,7 +315,7 @@ fill_buffer(struct input_stream *is)
 			return false;
 	}
 
-	return true;
+	return !g_queue_is_empty(c->buffers);
 }
 
 /**