diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/EntityDoiEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/EntityDoiEntity.java
index edb31da6c..54b5f7e31 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/EntityDoiEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/EntityDoiEntity.java
@@ -54,8 +54,7 @@ public class EntityDoiEntity {
 
     public static final String _isActive = "isActive";
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "entity_id", nullable = false)
+    @Column(name = "entity_id", columnDefinition = "BINARY(16)")
     private UUID entityId;
 
     public static final String _entityId = "entityId";
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/DMP.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMP.java
index f11b96f13..f9210f657 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/DMP.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMP.java
@@ -183,7 +183,8 @@ public class DMP implements DataEntity<DMP, UUID> {
     @Convert(converter = DateToUTCConverter.class)
     private Date publishedAt;
 
-    @OneToMany(mappedBy = "entityId", fetch = FetchType.LAZY)
+//    @OneToMany(mappedBy = "entityId", fetch = FetchType.LAZY)
+    @Transient
     private Set<EntityDoiEntity> dois;
 
     @ManyToOne(fetch = FetchType.LAZY)
@@ -341,6 +342,7 @@ public class DMP implements DataEntity<DMP, UUID> {
         this.publishedAt = publishedAt;
     }
 
+    //TODO: Dois will no longer be fetched by hibernate but using the query builders eventually. Use builder where this is called.
     public Set<EntityDoiEntity> getDois() {
         return dois;
     }