diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AggregateOfResourceAllocations.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AggregateOfResourceAllocations.java
index edbc29fc9..6424d48e1 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AggregateOfResourceAllocations.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AggregateOfResourceAllocations.java
@@ -40,4 +40,8 @@ public class AggregateOfResourceAllocations {
         return result;
     }
 
+    public boolean isEmpty() {
+        return resourceAllocations.isEmpty();
+    }
+
 }
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AggregateOfResourceAllocationsTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AggregateOfResourceAllocationsTest.java
index 41e35794e..d6c8e21ad 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AggregateOfResourceAllocationsTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AggregateOfResourceAllocationsTest.java
@@ -5,6 +5,7 @@ import static org.easymock.classextension.EasyMock.createMock;
 import static org.easymock.classextension.EasyMock.replay;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 import static org.junit.matchers.JUnitMatchers.hasItem;
 
 import java.util.ArrayList;
@@ -39,6 +40,12 @@ public class AggregateOfResourceAllocationsTest {
         assertThat(aggregate.getTotalHours(), equalTo(0));
     }
 
+    @Test
+    public void ifNoAllocationsIsEmpty() {
+        givenAggregateOfResourceAllocationsWithAssignedHours();
+        assertTrue(aggregate.isEmpty());
+    }
+
     @Test
     public void calculatesTheTotalHours() {
         givenAggregateOfResourceAllocationsWithAssignedHours(4, 5, 6);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
index dda935a6b..2f8cc764e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
@@ -60,7 +60,9 @@ class FormBinder {
     }
 
     private void loadValueForAssignedHoursComponent() {
-        this.assignedHoursComponent.setValue(aggregate.getTotalHours());
+        this.assignedHoursComponent
+                .setValue(aggregate.isEmpty() ? resourceAllocationsBeingEdited
+                        .getTask().getWorkHours() : aggregate.getTotalHours());
     }
 
     private void assignedHoursComponentDisabilityRule() {