diff --git a/src/fields/MapField.php b/src/fields/MapField.php
index <HASH>..<HASH> 100644
--- a/src/fields/MapField.php
+++ b/src/fields/MapField.php
@@ -326,7 +326,7 @@ class MapField extends Field implements PreviewableFieldInterface
 	 */
 	public function isValueEmpty ($value, ElementInterface $element): bool
 	{
-		return empty($value->lat) && empty($value->lng);
+		return $this->normalizeValue($value)->isValueEmpty();
 	}
 
 	// Methods: Events
diff --git a/src/models/Map.php b/src/models/Map.php
index <HASH>..<HASH> 100644
--- a/src/models/Map.php
+++ b/src/models/Map.php
@@ -109,4 +109,9 @@ class Map extends Model
 		return $rules;
 	}
 
+	public function isValueEmpty ()
+	{
+		return empty($this->lat) && empty($this->lng);
+	}
+
 }
Add isValueEmpty to map model