diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js
index 1f3bea12..c6fd922b 100644
--- a/app/models/form.server.model.js
+++ b/app/models/form.server.model.js
@@ -265,9 +265,11 @@ function formFieldsAllHaveIds(form_fields){
 }
 
 FormSchema.pre('save', function (next) {
-	this.form_fields = this.form_fields.filter(function(field){
-		return !field.deletePreserved;
-	});
+	if(this.form_fields && this.form_fields.length){
+		this.form_fields = this.form_fields.filter(function(field){
+			return !field.deletePreserved;
+		});
+	}
 	next();
 });