diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java
index 939af9157..c33bbe16e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java
@@ -268,6 +268,11 @@ public class CostCategoryCRUDController extends GenericForwardComposer
         lbHoursType.renderAll();
         lbHoursType.applyProperties();
 
+        if (lbHoursType.getItems().isEmpty()) {
+            row.appendChild(lbHoursType);
+            return;
+        }
+
         // First time is rendered, select first item
         TypeOfWorkHours type = hourCost.getType();
         if (hourCost.isNewObject() && type == null) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
index 8a2bd54cc..505feba88 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
@@ -1169,6 +1169,11 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
         lbHoursType.renderAll();
         lbHoursType.applyProperties();
 
+        if (lbHoursType.getItems().isEmpty()) {
+            row.appendChild(lbHoursType);
+            return;
+        }
+
         // First time is rendered, select first item
         TypeOfWorkHours type = workReportLine.getTypeOfWorkHours();
         if (workReportLine.isNewObject() && type == null) {