diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 8d272f67d..bf7f73d37 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -1672,21 +1672,26 @@ public class DataManagementPlanManager {
         dataBuilder.append("        \"description\": \"").append((dmp.getDescription() != null && !dmp.getDescription().isEmpty() ? dmp.getDescription() : "<p></p>")).append("\",\n");
         dataBuilder.append("        \"version\": \"").append(dmp.getVersion()).append("\",\n");
         dataBuilder.append("        \"access_right\": \"");
-        if (((Boolean)extraProperties.get("visible"))) {
-            Instant publicationDate = Instant.parse(extraProperties.get("publicDate").toString());
-            if (publicationDate.isBefore(Instant.now())) {
-                dataBuilder.append("open\",\n");
-            } else {
-                dataBuilder.append("embargoed\",\n");
-                dataBuilder.append("        \"embargo_date\": \"" + publicationDate + "\",\n");
-            }
-
-            if (extraProperties.get("license") != null) {
-                dataBuilder.append("        \"license\": \"").append(((Map)extraProperties.get("license")).get("pid")).append("\",\n");
-            }
-        } else {
+        if (extraProperties.get("visible") == null) {
             dataBuilder.append("restricted\",\n");
             dataBuilder.append("        \"access_conditions\": \"\",\n");
+        } else {
+            if (((Boolean) extraProperties.get("visible"))) {
+                Instant publicationDate = Instant.parse(extraProperties.get("publicDate").toString());
+                if (publicationDate.isBefore(Instant.now())) {
+                    dataBuilder.append("open\",\n");
+                } else {
+                    dataBuilder.append("embargoed\",\n");
+                    dataBuilder.append("        \"embargo_date\": \"" + publicationDate + "\",\n");
+                }
+
+                if (extraProperties.get("license") != null) {
+                    dataBuilder.append("        \"license\": \"").append(((Map) extraProperties.get("license")).get("pid")).append("\",\n");
+                }
+            } else {
+                dataBuilder.append("restricted\",\n");
+                dataBuilder.append("        \"access_conditions\": \"\",\n");
+            }
         }
         if (dmp.isPublic()) {
             dataBuilder.append("        \"related_identifiers\": [{\n");