diff --git a/NEWS b/NEWS
index 46f85ec09..b3231a676 100644
--- a/NEWS
+++ b/NEWS
@@ -47,6 +47,7 @@ ver 0.16 (20??/??/??)
 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 6cd2bc917..c3928a09b 100644
--- a/src/input/curl_input_plugin.c
+++ b/src/input/curl_input_plugin.c
@@ -310,7 +310,7 @@ fill_buffer(struct input_stream *is)
 			return false;
 	}
 
-	return true;
+	return !g_queue_is_empty(c->buffers);
 }
 
 /**