diff --git a/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/LaReferenciaDownloadLogs.java b/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/LaReferenciaDownloadLogs.java
index 01562e22a..0a2854729 100644
--- a/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/LaReferenciaDownloadLogs.java
+++ b/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/LaReferenciaDownloadLogs.java
@@ -219,7 +219,7 @@ public class LaReferenciaDownloadLogs {
 			int i = 0;
 
 			JSONParser parser = new JSONParser();
-			while (!content.equals("[]")) {
+			do {
 				String apiUrl = baseApiUrl;
 
 				if (i > 0) {
@@ -227,6 +227,8 @@ public class LaReferenciaDownloadLogs {
 				}
 
 				content = getJson(apiUrl);
+				if (content.length() == 0 || content.equals("[]"))
+					break;
 
 				JSONArray jsonArray = (JSONArray) parser.parse(content);
 				for (Object aJsonArray : jsonArray) {
@@ -241,7 +243,7 @@ public class LaReferenciaDownloadLogs {
 							+ " and for "
 							+ sdf.format(date));
 				i++;
-			}
+			} while (true);
 			fin.close();
 
 		}
diff --git a/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/PiwikDownloadLogs.java b/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/PiwikDownloadLogs.java
index 4118ce013..4d54a344e 100644
--- a/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/PiwikDownloadLogs.java
+++ b/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/PiwikDownloadLogs.java
@@ -163,7 +163,7 @@ public class PiwikDownloadLogs {
 				int i = 0;
 
 				JSONParser parser = new JSONParser();
-				while (!content.equals("[]")) {
+				do {
 					String apiUrl = baseApiUrl;
 
 					if (i > 0) {
@@ -171,6 +171,8 @@ public class PiwikDownloadLogs {
 					}
 
 					content = getJson(apiUrl);
+					if (content.length() == 0 || content.equals("[]"))
+						break;
 
 					JSONArray jsonArray = (JSONArray) parser.parse(content);
 					for (Object aJsonArray : jsonArray) {
@@ -180,7 +182,7 @@ public class PiwikDownloadLogs {
 					}
 
 					i++;
-				}
+				} while (true);
 				fin.close();
 			}