diff --git a/src/main/java/eu/openaire/urls_controller/components/ScheduledTasks.java b/src/main/java/eu/openaire/urls_controller/components/ScheduledTasks.java
index 7fb7cd8..27ddfbf 100644
--- a/src/main/java/eu/openaire/urls_controller/components/ScheduledTasks.java
+++ b/src/main/java/eu/openaire/urls_controller/components/ScheduledTasks.java
@@ -48,12 +48,17 @@ public class ScheduledTasks {
     //@Scheduled(initialDelay = 20_000, fixedDelay = 20_000)    // Just for testing (every 20 secs).
     public void executeBackgroundTasks()
     {
-        List<Callable<Boolean>> tempList = new ArrayList<>(FullTextsServiceImpl.backgroundCallableTasks);   // Copy the list in order to know what was executed and delete only that data later.
-        // So the items added while this execution happens, will be left in the list, while the other will be deleted.
+        List<Callable<Boolean>> tempList = new ArrayList<>(FullTextsServiceImpl.backgroundCallableTasks);   // Copy the list in order to know what was executed.
+        // So the items added while this execution happens, will be remain in the global-list, while the other will have already be deleted.
         int numOfTasks = tempList.size();   // Since the temp-list is a deep-copy and not a reference, new tasks that are added will not be executed.
         if ( numOfTasks == 0 )
             return;
 
+        // Immediately delete the selected tasks form the global list, so that if these tasks are not finished before the scheduler runs again, they will not be re-executed.
+        for ( Callable<Boolean> selectedTask : tempList ) {
+            FullTextsServiceImpl.backgroundCallableTasks.remove(selectedTask);
+        }
+
         logger.debug(numOfTasks + " background tasks were found inside the \"backgroundCallableTasks\" list and are about to be executed.");
         // Execute the tasks and wait for them to finish.
         try {
@@ -70,8 +75,6 @@ public class ScheduledTasks {
                     logger.error("Task_" + (i+1) + " was cancelled: " + ce.getMessage());
                 } catch (IndexOutOfBoundsException ioobe) {
                     logger.error("IOOBE for task_" + i + " in the futures-list! " + ioobe.getMessage());
-                } finally {
-                    FullTextsServiceImpl.backgroundCallableTasks.remove(tempList.get(i));   // Remove this object from the global list. Do not use indexes, since they will be different after each deletion and addition.
                 }
             }
         } catch (Exception e) {