diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/DmpRDAExportModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/DmpRDAExportModel.java
index 58b1e24b0..a4fab5c74 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/DmpRDAExportModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/rda/DmpRDAExportModel.java
@@ -82,7 +82,11 @@ public class DmpRDAExportModel {
 
 
     public DmpRDAExportModel fromDataModel(DMP entity) {
-        this.dmp_id = new DmpIdRDAExportModel(entity.getId().toString(), "argos_internal");
+    	if (entity.getDoi() != null)
+    		this.dmp_id = new DmpIdRDAExportModel(entity.getDoi(), "zenodo");
+    	else
+    		this.dmp_id = new DmpIdRDAExportModel(entity.getId().toString(), "argos_internal");
+
         this.title = entity.getLabel();
         this.description = entity.getDescription();
         this.created = entity.getCreated();