diff --git a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/orcid/ORCIDWorker.java b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/orcid/ORCIDWorker.java
index fe59fe71f..2767a3e41 100644
--- a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/orcid/ORCIDWorker.java
+++ b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/orcid/ORCIDWorker.java
@@ -135,7 +135,6 @@ public class ORCIDWorker extends Thread {
 				orcidId = queue.take();
 
 				if (orcidId.equalsIgnoreCase(JOB_COMPLETE)) {
-					queue.put(orcidId);
 					hasComplete = true;
 				} else {
 					start = System.currentTimeMillis();
diff --git a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/orcid/OrcidGetUpdatesFile.java b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/orcid/OrcidGetUpdatesFile.java
index c96423147..eb23a204f 100644
--- a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/orcid/OrcidGetUpdatesFile.java
+++ b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/orcid/OrcidGetUpdatesFile.java
@@ -155,15 +155,17 @@ public class OrcidGetUpdatesFile {
 								throw new RuntimeException(e);
 							}
 						});
-					queue.put(ORCIDWorker.JOB_COMPLETE);
+
 
 				}
 			}
 
+			for (int i = 0; i < 22; i++) {
+				queue.put(ORCIDWorker.JOB_COMPLETE);
+			}
 			for (ORCIDWorker worker : workers) {
 				worker.join();
 			}
-
 		}
 
 	}