diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
index 7680f9d0b..4ec165e46 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
@@ -66,7 +66,7 @@ public class Order extends OrderLineGroup {
     @NotNull(message = "order calendar not specified")
     private BaseCalendar calendar;
 
-    private boolean codeAutogenerated = false;
+    private Boolean codeAutogenerated = false;
 
     private Integer lastOrderElementSequenceCode = 0;
 
@@ -200,7 +200,7 @@ public class Order extends OrderLineGroup {
     }
 
     public boolean isCodeAutogenerated() {
-        return codeAutogenerated;
+        return codeAutogenerated != null && codeAutogenerated;
     }
 
     public void incrementLastOrderElementSequenceCode() {