diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
index c783ce567..314dfe9c0 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
@@ -375,6 +375,15 @@ public class SaveCommandBuilder {
             for (TaskElement taskElement : toRemove) {
                 try {
                     taskElementDAO.remove(taskElement.getId());
+
+                    TaskGroup parent = taskElement.getParent();
+                    if (parent != null) {
+                        parent.remove(taskElement);
+                        taskElementDAO.save(parent);
+                    }
+
+                    LOG.info("TaskElement removed because of TaskSource was null. "
+                            + taskElement);
                 } catch (InstanceNotFoundException e) {
                     // Do nothing
                     // Maybe it was already removed before reaching this point