diff --git a/obexd/client/session.c b/obexd/client/session.c
index 873d722..592624a 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
@@ -1000,6 +1000,9 @@ static void get_xfer_progress(GwObexXfer *xfer, gpointer user_data)
 		session->filled = 0;
 	}
 
+	if (session->size == -1)
+		goto complete;
+
 	if (session->transferred == session->size)
 		goto complete;
 
diff --git a/obexd/client/session.h b/obexd/client/session.h
index affe7f3..dd0c502 100644
--- a/obexd/client/session.h
+++ b/obexd/client/session.h
@@ -46,8 +46,8 @@ struct session_data {
 	GwObexXfer *xfer;
 	char buffer[4096];
 	int filled;
-	uint64_t size;
-	uint64_t transferred;
+	ssize_t size;
+	size_t transferred;
 	gchar *filename;
 	gchar *agent_name;
 	gchar *agent_path;