diff --git a/homeassistant/__init__.py b/homeassistant/__init__.py
index 5e54cbd5d0a..05bbb9b40ff 100644
--- a/homeassistant/__init__.py
+++ b/homeassistant/__init__.py
@@ -907,7 +907,8 @@ class Config(object):
         _LOGGER.info('Auto detecting location and temperature unit')
 
         try:
-            info = requests.get('https://freegeoip.net/json/').json()
+            info = requests.get(
+                'https://freegeoip.net/json/', timeout=5).json()
         except requests.RequestException:
             return