diff --git a/src/Frozennode/Administrator/Fields/Factory.php b/src/Frozennode/Administrator/Fields/Factory.php
index ffb2f5bda..f5ac20389 100644
--- a/src/Frozennode/Administrator/Fields/Factory.php
+++ b/src/Frozennode/Administrator/Fields/Factory.php
@@ -383,6 +383,9 @@ public function findFilter($field)
 	 */
 	public function getEditFields($loadRelationships = true, $override = false)
 	{
+		if(in_null($this->editFields)) {
+			$this->editFields = [];
+		}
 		if (!sizeof($this->editFields) || $override)
 		{
 			$this->editFields = array();