diff --git a/src/Geo/Form/GeoSelectHydratorStrategy.php b/src/Geo/Form/GeoSelectHydratorStrategy.php
index <HASH>..<HASH> 100644
--- a/src/Geo/Form/GeoSelectHydratorStrategy.php
+++ b/src/Geo/Form/GeoSelectHydratorStrategy.php
@@ -72,9 +72,12 @@ class GeoSelectHydratorStrategy implements StrategyInterface
         if (0 === strpos($value, '{')) {
             return $value;
         }
-
-        $data = $this->geoClient->queryOne($value);
-        return $data['id'];
+        if ($value){
+            $data = $this->geoClient->queryOne($value);
+            return $data['id'];
+        }else{
+            return;
+        }
     }
 
     /**
[Geo] do not query for geo locations, if no value is set.