diff --git a/lib/Geocode.php b/lib/Geocode.php
index 2c736475..a8fe11e2 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1240,7 +1240,7 @@
 							$aTerms = array();
 							$aOrder = array();
 
-							if ($aSearch['sHouseNumber'])
+							if ($aSearch['sHouseNumber'] && sizeof($aSearch['aAddress']))
 							{
 								$sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
 								$aOrder[] = "exists(select place_id from placex where parent_place_id = search_name.place_id and transliteration(housenumber) ~* E'".$sHouseNumberRegex."' limit 1) desc";