diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c
index 0f07c46..eb2bc9c 100644
--- a/obexd/plugins/pbap.c
+++ b/obexd/plugins/pbap.c
DBG("buffer %p maxlistcount %d", obj->buffer,
pbap->params->maxlistcount);
- if (!obj->buffer && !obj->aparams)
- return -EAGAIN;
+ if (!obj->buffer) {
+ if (pbap->params->maxlistcount == 0)
+ return -ENOSTR;
- if (pbap->params->maxlistcount == 0)
- return -ENOSTR;
+ return -EAGAIN;
+ }
len = string_read(obj->buffer, buf, count);
if (len == 0 && !obj->lastpart) {