diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
index e717bed77..334141293 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
@@ -324,8 +324,9 @@ public abstract class OrderElement extends IntegrationEntity implements
     }
 
     private boolean wasASchedulingPoint() {
-        return getTaskSource() != null
-                && getTaskSource().getTask() instanceof Task;
+        SchedulingDataForVersion currentVersionOnDB = getCurrentVersionOnDB();
+        return SchedulingState.Type.SCHEDULING_POINT == currentVersionOnDB
+                .getSchedulingStateType();
     }
 
     private boolean itWasntSchedulingPoint() {