diff --git a/src/CreateProject.vue b/src/CreateProject.vue
index 8a010c39e0c03f2d75b1e7569058f99c7870c49d..3908a91de79f53a6acabb03601f418f5753ad7b1 100644
--- a/src/CreateProject.vue
+++ b/src/CreateProject.vue
@@ -614,8 +614,8 @@ export default Vue.extend({
       this.form.StartDate = new Date(data.startDate);
       this.startDateSelected(new Date(this.form.StartDate));
       this.form.EndDate = new Date(data.endDate);
-      this.form.Discipline = data.disciplines;
-      this.form.Organization = data.organizations;
+      this.form.Discipline = data.disciplines ? data.disciplines : [];
+      this.form.Organization = data.organizations ? data.organizations : [];
       const keywords = data.keywords ? data.keywords.split(';') : [];
       this.form.Keywords = keywords;
       this.form.Visibility = data.visibility;