diff --git a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Base-1.0.jar b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Base-1.0.jar
index 8fcb9879..a42625f5 100644
Binary files a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Base-1.0.jar and b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Base-1.0.jar differ
diff --git a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2CRUDInterface-1.0.jar b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2CRUDInterface-1.0.jar
index 5ffe43d2..df73a06c 100644
Binary files a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2CRUDInterface-1.0.jar and b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2CRUDInterface-1.0.jar differ
diff --git a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2CRUDrdb-1.0.jar b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2CRUDrdb-1.0.jar
index 35a312fa..8868bd7c 100644
Binary files a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2CRUDrdb-1.0.jar and b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2CRUDrdb-1.0.jar differ
diff --git a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2JavaAPI-1.0.jar b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2JavaAPI-1.0.jar
index c539c61c..ef1b2ba8 100644
Binary files a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2JavaAPI-1.0.jar and b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2JavaAPI-1.0.jar differ
diff --git a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Migration-1.0.jar b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Migration-1.0.jar
index 9ffa15a2..dc57ea8c 100644
Binary files a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Migration-1.0.jar and b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Migration-1.0.jar differ
diff --git a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Model-1.0.jar b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Model-1.0.jar
index 2ba8c302..c4f28b51 100644
Binary files a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Model-1.0.jar and b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Model-1.0.jar differ
diff --git a/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2Base-1.0.jar b/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2Base-1.0.jar
index 8fcb9879..a42625f5 100644
Binary files a/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2Base-1.0.jar and b/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2Base-1.0.jar differ
diff --git a/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2CRUDInterface-1.0.jar b/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2CRUDInterface-1.0.jar
index 5ffe43d2..df73a06c 100644
Binary files a/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2CRUDInterface-1.0.jar and b/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2CRUDInterface-1.0.jar differ
diff --git a/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2CRUDrdb-1.0.jar b/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2CRUDrdb-1.0.jar
index 35a312fa..8868bd7c 100644
Binary files a/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2CRUDrdb-1.0.jar and b/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2CRUDrdb-1.0.jar differ
diff --git a/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2Model-1.0.jar b/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2Model-1.0.jar
index 2ba8c302..c4f28b51 100644
Binary files a/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2Model-1.0.jar and b/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2Model-1.0.jar differ
diff --git a/sources/Re3gistry2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegInstallationHandler.java b/sources/Re3gistry2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegInstallationHandler.java
index c242cdbe..54e797ad 100644
--- a/sources/Re3gistry2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegInstallationHandler.java
+++ b/sources/Re3gistry2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegInstallationHandler.java
@@ -357,9 +357,14 @@ public RegItem createRegItemWithoutCollection(String uriname, RegItemclass regIt
         }
 
         regItem.setCurrentversion(version);
-        regItem.setInsertdate(datecreation);
-        regItem.setEditdate(datelastupdate);
-
+        if (datecreation != null) {
+            regItem.setInsertdate(datecreation);
+        } else {
+            regItem.setInsertdate(new Date());
+        }
+        if (datelastupdate != null) {
+            regItem.setEditdate(datelastupdate);
+        }
         try {
             if (!entityManagerRe3gistry2.getTransaction().isActive()) {
                 entityManagerRe3gistry2.getTransaction().begin();
diff --git a/sources/Re3gistry2Migration/src/main/java/eu/europa/ec/re3gistry2/migration/manager/MigrateItemLatestVersion.java b/sources/Re3gistry2Migration/src/main/java/eu/europa/ec/re3gistry2/migration/manager/MigrateItemLatestVersion.java
index 7ad39974..d134db78 100644
--- a/sources/Re3gistry2Migration/src/main/java/eu/europa/ec/re3gistry2/migration/manager/MigrateItemLatestVersion.java
+++ b/sources/Re3gistry2Migration/src/main/java/eu/europa/ec/re3gistry2/migration/manager/MigrateItemLatestVersion.java
@@ -648,8 +648,14 @@ public RegItem createRegItemWithoutCollection(Item item, RegItemclass regItemcla
             }
             regItem.setRorExport(Boolean.FALSE);
 
-            regItem.setInsertdate(item.getDatecreation());
-            regItem.setEditdate(item.getDatelastupdate());
+            if (item.getDatecreation() != null) {
+                regItem.setInsertdate(item.getDatecreation());
+            } else {
+                regItem.setInsertdate(new Date());
+            }
+            if (item.getDatelastupdate() != null) {
+                regItem.setEditdate(item.getDatelastupdate());
+            }
             regItem.setCurrentversion(version);
 
             if (localid.startsWith(BaseConstants.KEY_PARAMETER_HTTP) || localid.startsWith(BaseConstants.KEY_PARAMETER_HTTPS)) {
@@ -709,8 +715,14 @@ RegItem createRegItemWithCollection(Item item, RegItemclass regItemclass, Item i
             }
             regItem.setRorExport(Boolean.FALSE);
 
-            regItem.setInsertdate(item.getDatecreation());
-            regItem.setEditdate(item.getDatelastupdate());
+            if (item.getDatecreation() != null) {
+                regItem.setInsertdate(item.getDatecreation());
+            } else {
+                regItem.setInsertdate(new Date());
+            }
+            if (item.getDatelastupdate() != null) {
+                regItem.setEditdate(item.getDatelastupdate());
+            }
             regItem.setCurrentversion(version);
 
             if (localid.startsWith(BaseConstants.KEY_PARAMETER_HTTP) || localid.startsWith(BaseConstants.KEY_PARAMETER_HTTPS)) {
diff --git a/sources/Re3gistry2Migration/src/main/java/eu/europa/ec/re3gistry2/migration/utility/ConstantsMigration.java b/sources/Re3gistry2Migration/src/main/java/eu/europa/ec/re3gistry2/migration/utility/ConstantsMigration.java
index f6e5f544..60f2efb6 100644
--- a/sources/Re3gistry2Migration/src/main/java/eu/europa/ec/re3gistry2/migration/utility/ConstantsMigration.java
+++ b/sources/Re3gistry2Migration/src/main/java/eu/europa/ec/re3gistry2/migration/utility/ConstantsMigration.java
@@ -83,6 +83,8 @@ public class ConstantsMigration {
             + "i.uriname as uriname, "
             + "i.itemclass as itemclass, "
             + "i.versionnumber as versionnumber, "
+            + "i.datecreation as datecreation, "
+            + "i.datelastupdate as datelastupdate, "
             + "i.status as status\n"
             + "FROM Item i \n"
             + "WHERE i.itemclass = :itemclass AND i.versionnumber = '0'";