diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
index 26ea269a5..6b57b2ca1 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
@@ -188,10 +188,9 @@ public abstract class Resource extends IntegrationEntity {
         @Override
         List<DayAssignment> calculateAssignments() {
             List<DayAssignment> result = new ArrayList<DayAssignment>();
-            Scenario current = Registry.getScenarioManager().getCurrent();
             for (DayAssignment each : dayAssignments) {
                 if (isTransient(each)
-                        || each.getScenario().equals(current)) {
+                        || each.getScenario().equals(currentScenario)) {
                     result.add(each);
                 }
             }