diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c
index 2a7d6d1..9a8d8f5 100644
--- a/obexd/plugins/pbap.c
+++ b/obexd/plugins/pbap.c
@@ -347,7 +347,7 @@ static gpointer vobject_open(const char *name, int oflag, mode_t mode,
 	}
 
 	if (size)
-		*size = 1;
+		*size = OBJECT_SIZE_UNKNOWN;
 
 	return query;
 
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index 0b0c0f2..3e4dea3 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -366,8 +366,11 @@ static void cmd_get(struct obex_session *os, obex_t *obex, obex_object_t *obj)
 
 	rsp = os->service->get(os, obj);
 	if (rsp == OBEX_RSP_SUCCESS) {
-		hd.bq4 = os->size;
-		OBEX_ObjectAddHeader(obex, obj, OBEX_HDR_LENGTH, hd, 4, 0);
+		if (os->size != OBJECT_SIZE_UNKNOWN) {
+			hd.bq4 = os->size;
+			OBEX_ObjectAddHeader(obex, obj,
+					OBEX_HDR_LENGTH, hd, 4, 0);
+		}
 
 		/* Add body header */
 		hd.bs = NULL;