diff --git a/homeassistant/util/location.py b/homeassistant/util/location.py
index d999b824a1d..55f8a834308 100644
--- a/homeassistant/util/location.py
+++ b/homeassistant/util/location.py
@@ -63,10 +63,11 @@ def distance(lat1, lon1, lat2, lon2):
 
 def elevation(latitude, longitude):
     """Return elevation for given latitude and longitude."""
-    req = requests.get(ELEVATION_URL, params={
-        'locations': '{},{}'.format(latitude, longitude),
-        'sensor': 'false',
-    })
+    req = requests.get(ELEVATION_URL,
+                       params={'locations': '{},{}'.format(latitude,
+                                                           longitude),
+                               'sensor': 'false'},
+                       timeout=10)
 
     if req.status_code != 200:
         return 0