diff --git a/code/Model/EditableFormField/EditableCountryDropdownField.php b/code/Model/EditableFormField/EditableCountryDropdownField.php
index b0b4109..f78bae0 100644
--- a/code/Model/EditableFormField/EditableCountryDropdownField.php
+++ b/code/Model/EditableFormField/EditableCountryDropdownField.php
@@ -47,7 +47,7 @@ class EditableCountryDropdownField extends EditableFormField
 
     public function getValueFromData($data)
     {
-        if (isset($data[$this->Name])) {
+        if (isset($data[$this->Name]) && !empty($data[$this->Name])) {
             $source = $this->getFormField()->getSource();
             return $source[$data[$this->Name]];
         }